diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-02-25 17:41:26 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-02-25 17:41:26 +0100 |
| commit | 89f8067dd732fe402c3c5f8380bb5649fe02d1a4 (patch) | |
| tree | 26c49685853b85c409d96ab6b547e6eee7b6e5e5 /dde_e1000 | |
| parent | 816140d6c6cd5f369dc8d92031128279d0c44fd2 (diff) | |
| parent | 29af9988d7213fcccf11011159261b94af4f1bee (diff) | |
Merge branch 'master' of git.debian.org:/git/pkg-hurd/hurd
Conflicts:
debian/changelog
Diffstat (limited to 'dde_e1000')
| -rw-r--r-- | dde_e1000/Makeconf.local | 4 | ||||
| -rw-r--r-- | dde_e1000/Makefile | 2 | ||||
| -rw-r--r-- | dde_e1000/main.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/dde_e1000/Makeconf.local b/dde_e1000/Makeconf.local index 40e3e8e4..130c8cc7 100644 --- a/dde_e1000/Makeconf.local +++ b/dde_e1000/Makeconf.local @@ -4,8 +4,8 @@ SYSTEM = x86-l4v2 BUILDDIR ?= .. -libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a -libddekit_path := $(BUILDDIR)/libddekit/libddekit.a +libmachdev_path := -L$(BUILDDIR)/libmachdev -lmachdev +libddekit_path := -L$(BUILDDIR)/libddekit -lddekit libslab_path := -L$(BUILDDIR)/libhurd-slab -lhurd-slab libbpf_path := -L$(BUILDDIR)/libbpf -lbpf diff --git a/dde_e1000/Makefile b/dde_e1000/Makefile index df301125..fecd94d4 100644 --- a/dde_e1000/Makefile +++ b/dde_e1000/Makefile @@ -8,7 +8,7 @@ TARGET = dde_e1000 SRC_C = main.c e1000_ethtool.c e1000_hw.c e1000_main.c e1000_param.c LIBS += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lz -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_e1000/main.c b/dde_e1000/main.c index 63ab182f..98f4452a 100644 --- a/dde_e1000/main.c +++ b/dde_e1000/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; |