diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-04-07 22:06:39 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-04-07 22:06:39 +0000 |
| commit | 130cf77b86a7777994f1e1e8dcb646f366a2d294 (patch) | |
| tree | a37fe24d4852af00f87b7dc0864d1f28a968f474 /dde_ne2k_pci | |
| parent | 4057679b76ae5e1f7e79802be8399396f29c0b09 (diff) | |
| parent | 06fe9218fd82aeae688cfba5bda512d808bd443f (diff) | |
Merge branch 'dde' of git.savannah.gnu.org:/srv/git/hurd/incubator into dde
Diffstat (limited to 'dde_ne2k_pci')
| -rw-r--r-- | dde_ne2k_pci/Makeconf.local | 29 | ||||
| -rw-r--r-- | dde_ne2k_pci/Makefile | 2 | ||||
| -rw-r--r-- | dde_ne2k_pci/main.c | 2 |
3 files changed, 7 insertions, 26 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 diff --git a/dde_ne2k_pci/Makefile b/dde_ne2k_pci/Makefile index 44e805e0..f414a3f3 100644 --- a/dde_ne2k_pci/Makefile +++ b/dde_ne2k_pci/Makefile @@ -10,7 +10,7 @@ TARGET = dde_ne2k_pci SRC_C = main.c ne2k-pci.c 8390.c LIBS += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports $(libslab_path) $(libbpf_path) -CFLAGS += -g -I$(PKGDIR)/include -I../libmachdev +CFLAGS += -g -I$(PKGDIR)/include -I$(BUILDDIR)/include # DDE configuration include $(L4DIR)/Makeconf diff --git a/dde_ne2k_pci/main.c b/dde_ne2k_pci/main.c index 63ab182f..98f4452a 100644 --- a/dde_ne2k_pci/main.c +++ b/dde_ne2k_pci/main.c @@ -6,7 +6,7 @@ #include <linux/init.h> // initcall() #include <linux/delay.h> // msleep() -#include <machdev.h> +#include <hurd/machdev.h> int using_std = 1; |