diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-02-19 16:02:33 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-02-19 16:02:33 +0000 |
| commit | 6026099658e372cde39aebbaf279e1a66ec3ba3c (patch) | |
| tree | e415b3c1fe9bacf7812d5bc0cac3e11c2ba0092f /dde_ne2k_pci/Makeconf.local | |
| parent | 54eb463b539f9868ecd85946806b871b4e5dc472 (diff) | |
| parent | c33d6ed786cdb46310dcb2a80056062d978759d0 (diff) | |
Merge branch 'dde' into upstream-merged
Diffstat (limited to 'dde_ne2k_pci/Makeconf.local')
| -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..40e3e8e4 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 := -L$(BUILDDIR)/libhurd-slab -lhurd-slab +libbpf_path := -L$(BUILDDIR)/libbpf -lbpf DDEKITLIBDIR = $(PKGDIR)/../libddekit/ DDEKITINCDIR = $(PKGDIR)/../libddekit/include |