diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-02-19 15:51:34 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-02-19 15:51:34 +0000 |
| commit | a46726a4fe9959649c33319bba59cb07074ae908 (patch) | |
| tree | 04c22a7aacabd0d9b570dfcac2ec2099bd0b654b /dde_ne2k_pci | |
| parent | d5d19062e39016b362ff8b2921903c81eb3a5453 (diff) | |
| parent | 5389b476b0c88d1555186fb8f4e68a5bc198d348 (diff) | |
Merge branch 'dde-upstream' into dde
Diffstat (limited to 'dde_ne2k_pci')
| -rw-r--r-- | dde_ne2k_pci/Makeconf.local | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/dde_ne2k_pci/Makeconf.local b/dde_ne2k_pci/Makeconf.local index 44f70ab8..fb8e6ae6 100644 --- a/dde_ne2k_pci/Makeconf.local +++ b/dde_ne2k_pci/Makeconf.local @@ -2,31 +2,12 @@ SYSTEMS = x86-l4v2 ARCH = x86 SYSTEM = x86-l4v2 -BUILDDIR ?= +BUILDDIR ?= .. -libmachdev_path := ../libmachdev/libmachdev.a -has_libmachdev := $(wildcard $(libmachdev_path)) -ifeq ($(strip $(has_libmachdev)),) - libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a -endif - -libddekit_path := ../libddekit/libddekit.a -has_libddekit := $(wildcard $(libddekit_path)) -ifeq ($(strip $(has_libddekit)),) - libddekit_path := $(BUILDDIR)/libddekit/libddekit.a -endif - -libslab_path := ../libhurd-slab/libhurd-slab.a -has_libslab := $(wildcard $(libslab_path)) -ifeq ($(strip $(has_libslab)),) - libslab_path := $(BUILDDIR)/libhurd-slab/libhurd-slab.a -endif - -libbpf_path := ../libbpf/libbpf.a -has_libbpf := $(wildcard $(libbpf_path)) -ifeq ($(strip $(has_libbpf)),) - libbpf_path := $(BUILDDIR)/libbpf/libbpf.a -endif +libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a +libddekit_path := $(BUILDDIR)/libddekit/libddekit.a +libslab_path := $(BUILDDIR)/libhurd-slab/libhurd-slab.a +libbpf_path := $(BUILDDIR)/libbpf/libbpf.a DDEKITLIBDIR = $(PKGDIR)/../libddekit/ DDEKITINCDIR = $(PKGDIR)/../libddekit/include |