Merge branch 'master' of git.debian.org:/git/pkg-hurd/hurd

Conflicts:
	debian/changelog

45 files changed, 79 insertions, 59 deletions

diff --git a/dde_e100/Makeconf.local b/dde_e100/Makeconf.local
index 40e3e8e4..130c8cc7 100644
--- a/dde_e100/Makeconf.local
+++ b/dde_e100/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_e100/Makefile b/dde_e100/Makefile
index 1fa82e1a..eaed375f 100644
--- a/dde_e100/Makefile
+++ b/dde_e100/Makefile
@@ -8,7 +8,7 @@ TARGET         = dde_e100
 SRC_C          = main.c e100.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_e100/main.c b/dde_e100/main.c
index 63ab182f..98f4452a 100644
--- a/dde_e100/main.c
+++ b/dde_e100/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;
 
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;
 
diff --git a/dde_ne2k_pci/Makeconf.local b/dde_ne2k_pci/Makeconf.local
index 40e3e8e4..130c8cc7 100644
--- a/dde_ne2k_pci/Makeconf.local
+++ b/dde_ne2k_pci/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_ne2k_pci/Makefile b/dde_ne2k_pci/Makefile
index 0f25544f..5bb27da9 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 -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_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;
 
diff --git a/dde_pcnet32/Makeconf.local b/dde_pcnet32/Makeconf.local
index 40e3e8e4..130c8cc7 100644
--- a/dde_pcnet32/Makeconf.local
+++ b/dde_pcnet32/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_pcnet32/Makefile b/dde_pcnet32/Makefile
index bcdcb425..0268d80b 100644
--- a/dde_pcnet32/Makefile
+++ b/dde_pcnet32/Makefile
@@ -8,7 +8,7 @@ TARGET         = dde_pcnet32
 SRC_C          = main.c pcnet32.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_pcnet32/main.c b/dde_pcnet32/main.c
index 63ab182f..98f4452a 100644
--- a/dde_pcnet32/main.c
+++ b/dde_pcnet32/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;
 
diff --git a/dde_rtl8139/Makeconf.local b/dde_rtl8139/Makeconf.local
index 40e3e8e4..130c8cc7 100644
--- a/dde_rtl8139/Makeconf.local
+++ b/dde_rtl8139/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_rtl8139/Makefile b/dde_rtl8139/Makefile
index a9acda45..0a9b1b71 100644
--- a/dde_rtl8139/Makefile
+++ b/dde_rtl8139/Makefile
@@ -10,7 +10,7 @@ TARGET         = dde_rtl8139
 SRC_C          = main.c 8139cp.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_rtl8139/main.c b/dde_rtl8139/main.c
index 63ab182f..98f4452a 100644
--- a/dde_rtl8139/main.c
+++ b/dde_rtl8139/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;
 
diff --git a/debian/changelog b/debian/changelog
index f2595633..ae352640 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,16 @@
-hurd (20120219-2) UNRELEASED; urgency=low
+hurd (20120222-2) UNRELEASED; urgency=low
 
   * control: Bump Standards-Version to 3.9.3 (no changes).
 
  -- Samuel Thibault <sthibault@debian.org>  Sat, 25 Feb 2012 17:40:16 +0100
 
+hurd (20120222-1) unstable; urgency=low
+
+  * New upstream snapshot
+  * Add libddekit and libdde_linux26 headers.
+
+ -- Samuel Thibault <sthibault@debian.org>  Wed, 22 Feb 2012 01:57:29 +0000
+
 hurd (20120219-1) unstable; urgency=low
 
   [ Samuel Thibault ]
diff --git a/debian/hurd-dev.install b/debian/hurd-dev.install
index 7bd68e9f..2bfce014 100644
--- a/debian/hurd-dev.install
+++ b/debian/hurd-dev.install
@@ -1,3 +1,7 @@
 debian/tmp/lib/*.a lib
 debian/tmp/include/* usr/include
 debian/tmp/lib/*.so lib
+libdde_linux26/lib/src/libdde_*.a usr/lib
+libdde_linux26/mk usr/share/libdde_linux26
+libdde_linux26/Makeconf* usr/share/libdde_linux26
+debian/tmp/usr/share/libdde_linux26/build usr/share/libdde_linux26
diff --git a/debian/hurd.install b/debian/hurd.install
index 2ffe0813..ad87beb5 100644
--- a/debian/hurd.install
+++ b/debian/hurd.install
@@ -67,8 +67,8 @@ debian/tmp/etc/login/README
 debian/tmp/etc/ttys
 debian/tmp/dev/MAKEDEV
 debian/tmp/share/msgids/hurd.msgids usr/share/msgids
-dde_e100/dde_e100 /hurd/dde
-dde_e1000/dde_e1000 /hurd/dde
-dde_rtl8139/dde_rtl8139 /hurd/dde
-dde_pcnet32/dde_pcnet32 /hurd/dde
-dde_ne2k_pci/dde_ne2k_pci /hurd/dde
+dde_e100/dde_e100 /hurd
+dde_e1000/dde_e1000 /hurd
+dde_rtl8139/dde_rtl8139 /hurd
+dde_pcnet32/dde_pcnet32 /hurd
+dde_ne2k_pci/dde_ne2k_pci /hurd
diff --git a/debian/rules b/debian/rules
index ee99469d..4ffe0fe3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,23 +29,25 @@ DEB_MAKE_INSTALL_TARGET = install prefix=$(DEB_DESTDIR) sysconfdir=$(DEB_DESTDIR
 DEB_DH_STRIP_ARGS := --dbg-package=hurd
 DEB_DH_MAKESHLIBS_ARGS_hurd := --add-udeb="hurd-udeb"
 
+DDE_DRIVERS = e100 e1000 pcnet32 rtl8139 ne2k_pci
+
 build/hurd::
 	cd $(DEB_BUILDDIR)/doc && texi2html -split chapter ../../doc/hurd.texi
-	$(MAKE) -C libdde_linux26 BUILDDIR=$(PWD)/build
-	$(MAKE) -C dde_e100 BUILDDIR=$(PWD)/build
-	$(MAKE) -C dde_e1000 BUILDDIR=$(PWD)/build
-	$(MAKE) -C dde_pcnet32 BUILDDIR=$(PWD)/build
-	$(MAKE) -C dde_rtl8139 BUILDDIR=$(PWD)/build
-	$(MAKE) -C dde_ne2k_pci BUILDDIR=$(PWD)/build
+	$(MAKE) -C libdde_linux26 BUILDDIR=$(CURDIR)/build
+	for i in $(DDE_DRIVERS) ; \
+	do \
+		$(MAKE) -C dde_$$i BUILDDIR=$(CURDIR)/build || exit 1 ; \
+	done
 
 clean::
 	$(MAKE) -C libdde_linux26 cleanall
 	rm -f $$(find libdde_linux26 -name \*.d)
-	$(MAKE) -C dde_e100 cleanall
-	$(MAKE) -C dde_e1000 cleanall
-	$(MAKE) -C dde_pcnet32 cleanall
-	$(MAKE) -C dde_rtl8139 cleanall
-	$(MAKE) -C dde_ne2k_pci cleanall
+	rm -fr libdde_linux26/build
+	rm -fr libdde_linux26/lib/src/gen_crc32table libdde_linux26/lib/src/crc32table.h libdde_linux26/lib/src/timeconst.h
+	for i in $(DDE_DRIVERS) ; \
+	do \
+		$(MAKE) -C dde_$$i cleanall ; \
+	done
 
 install/hurd::
 	# runsystem is managed by update-alternatives
@@ -70,6 +72,8 @@ install/hurd::
 	install -m664 $(DEB_SRCDIR)/console/motd.UTF8 debian/hurd/etc/
 	install -m664 $(DEB_SRCDIR)/release/servers.boot debian/hurd/boot/
 
+	$(MAKE) -C libdde_linux26 INSTALLDIR=$(CURDIR)/debian/tmp/usr/share/libdde_linux26/build/include install
+
 install/hurd-dev::
 	install -m644 debian/local/soundcard.h debian/tmp/include/sys
 	install -m644 debian/local/cdrom.h debian/tmp/include/sys
diff --git a/libbpf/Makefile b/libbpf/Makefile
index 5ce87573..1000429d 100644
--- a/libbpf/Makefile
+++ b/libbpf/Makefile
@@ -21,7 +21,7 @@ makemode := library
 libname = libbpf
 SRCS= bpf_impl.c queue.c
 LCLHDRS = bpf_impl.h queue.h
-installhdrs = 
+installhdrs = bpf_impl.h
 
 MIGSTUBS = 
 OBJS = $(sort $(SRCS:.c=.o) $(MIGSTUBS))
diff --git a/libdde_linux26/Makeconf b/libdde_linux26/Makeconf
index 4ee54c66..00c59092 100644
--- a/libdde_linux26/Makeconf
+++ b/libdde_linux26/Makeconf
@@ -39,7 +39,7 @@ ifeq ($(ARCH), x86)
 MY_DDE_INCDIR += $(OBJ_BASE)/include/linux-headers/asm/mach-default
 endif
 
-PRIVATE_INCDIR += $(MY_DDE_INCDIR) $(MY_LINUX26_INCDIR) $(PKGDIR)/../libddekit/include
+PRIVATE_INCDIR += $(MY_DDE_INCDIR) $(MY_LINUX26_INCDIR) $(PKGDIR)/../libddekit
 
 DEFINES += -D__KERNEL__ -DDDE_LINUX $(KBUILD_DEFINES)
 CPPFLAGS += $(KBUILD_CPPFLAGS)
diff --git a/libdde_linux26/mk/prog.mk b/libdde_linux26/mk/prog.mk
index d54c38e9..c1d5d9a8 100644
--- a/libdde_linux26/mk/prog.mk
+++ b/libdde_linux26/mk/prog.mk
@@ -56,7 +56,6 @@ TARGET_STANDARD := $(TARGET) $(TARGET_$(OSYSTEM))
 TARGET_PROFILE := $(addsuffix .pr,$(filter $(BUILD_PROFILE),$(TARGET)))
 TARGET	+= $(TARGET_$(OSYSTEM)) $(TARGET_PROFILE)
 
-CFLAGS += $(DDEKITINCDIR)
 # define some variables different for lib.mk and prog.mk
 ifeq ($(MODE),loader)
 LDFLAGS += --dynamic-linker libld-l4.s.so
diff --git a/libddekit/Makefile b/libddekit/Makefile
index 58dbd555..4f6e8aaa 100644
--- a/libddekit/Makefile
+++ b/libddekit/Makefile
@@ -22,17 +22,20 @@ libname = libddekit
 SRCS= condvar.c init.c interrupt.c lock.c malloc.c memory.c 	\
       pci.c pgtab.c printf.c resources.c list.c panic.c \
       thread.c timer.c initcall.c
-LCLHDRS = include/ddekit/condvar.h include/ddekit/lock.h	\
-	  include/ddekit/semaphore.h include/ddekit/debug.h	\
-	  include/ddekit/inline.h include/ddekit/panic.h	\
-	  include/ddekit/thread.h include/ddekit/types.h	\
-	  include/ddekit/pgtab.h include/ddekit/printf.h	\
-	  include/ddekit/pci.h include/ddekit/assert.h		\
-	  include/ddekit/interrupt.h include/ddekit/resources.h	\
-	  include/ddekit/memory.h include/ddekit/timer.h	\
-	  include/dde.h		\
+installhdrs = ddekit/condvar.h ddekit/lock.h	\
+	  ddekit/semaphore.h ddekit/debug.h	\
+	  ddekit/inline.h ddekit/panic.h	\
+	  ddekit/thread.h ddekit/types.h	\
+	  ddekit/pgtab.h ddekit/printf.h	\
+	  ddekit/pci.h ddekit/assert.h		\
+	  ddekit/interrupt.h ddekit/resources.h	\
+	  ddekit/memory.h ddekit/timer.h	\
+	  ddekit/initcall.h
+
+installhdrsubdir = .
+LCLHDRS = $(installhdrs)	\
+	  dde.h		\
 	  config.h list.h util.h
-installhdrs = 
 
 MIGSTUBS = experimentalUser.o
 OBJS = $(sort $(SRCS:.c=.o) $(MIGSTUBS))
@@ -43,5 +46,7 @@ MIGCOMSFLAGS = -prefix dde_
 
 include ../Makeconf
 
-LDFLAGS += -lpciaccess
-CFLAGS += -I$(srcdir)/include
+LIBS += -lpciaccess
+
+$(libname).so.$(hurd-version):
+	echo "INPUT ( $(libname).a )" > $@
diff --git a/libddekit/include/dde.h b/libddekit/dde.h
index 12f8a81a..12f8a81a 100644
--- a/libddekit/include/dde.h
+++ b/libddekit/dde.h
diff --git a/libddekit/include/ddekit/assert.h b/libddekit/ddekit/assert.h
index 5d593662..5d593662 100644
--- a/libddekit/include/ddekit/assert.h
+++ b/libddekit/ddekit/assert.h
diff --git a/libddekit/include/ddekit/condvar.h b/libddekit/ddekit/condvar.h
index 129a718d..129a718d 100644
--- a/libddekit/include/ddekit/condvar.h
+++ b/libddekit/ddekit/condvar.h
diff --git a/libddekit/include/ddekit/debug.h b/libddekit/ddekit/debug.h
index 79a8e7b5..79a8e7b5 100644
--- a/libddekit/include/ddekit/debug.h
+++ b/libddekit/ddekit/debug.h
diff --git a/libddekit/include/ddekit/initcall.h b/libddekit/ddekit/initcall.h
index 6befa31c..6befa31c 100644
--- a/libddekit/include/ddekit/initcall.h
+++ b/libddekit/ddekit/initcall.h
diff --git a/libddekit/include/ddekit/inline.h b/libddekit/ddekit/inline.h
index e59a5c68..e59a5c68 100644
--- a/libddekit/include/ddekit/inline.h
+++ b/libddekit/ddekit/inline.h
diff --git a/libddekit/include/ddekit/interrupt.h b/libddekit/ddekit/interrupt.h
index 3f789210..3f789210 100644
--- a/libddekit/include/ddekit/interrupt.h
+++ b/libddekit/ddekit/interrupt.h
diff --git a/libddekit/include/ddekit/lock.h b/libddekit/ddekit/lock.h
index dd398b38..dd398b38 100644
--- a/libddekit/include/ddekit/lock.h
+++ b/libddekit/ddekit/lock.h
diff --git a/libddekit/include/ddekit/memory.h b/libddekit/ddekit/memory.h
index 051a4d9e..051a4d9e 100644
--- a/libddekit/include/ddekit/memory.h
+++ b/libddekit/ddekit/memory.h
diff --git a/libddekit/include/ddekit/panic.h b/libddekit/ddekit/panic.h
index 1468675f..1468675f 100644
--- a/libddekit/include/ddekit/panic.h
+++ b/libddekit/ddekit/panic.h
diff --git a/libddekit/include/ddekit/pci.h b/libddekit/ddekit/pci.h
index 5a5fd29b..5a5fd29b 100644
--- a/libddekit/include/ddekit/pci.h
+++ b/libddekit/ddekit/pci.h
diff --git a/libddekit/include/ddekit/pgtab.h b/libddekit/ddekit/pgtab.h
index 8964b713..8964b713 100644
--- a/libddekit/include/ddekit/pgtab.h
+++ b/libddekit/ddekit/pgtab.h
diff --git a/libddekit/include/ddekit/printf.h b/libddekit/ddekit/printf.h
index 6dafa18d..6dafa18d 100644
--- a/libddekit/include/ddekit/printf.h
+++ b/libddekit/ddekit/printf.h
diff --git a/libddekit/include/ddekit/resources.h b/libddekit/ddekit/resources.h
index 657295a0..657295a0 100644
--- a/libddekit/include/ddekit/resources.h
+++ b/libddekit/ddekit/resources.h
diff --git a/libddekit/include/ddekit/semaphore.h b/libddekit/ddekit/semaphore.h
index c959919d..c959919d 100644
--- a/libddekit/include/ddekit/semaphore.h
+++ b/libddekit/ddekit/semaphore.h
diff --git a/libddekit/include/ddekit/thread.h b/libddekit/ddekit/thread.h
index 8ed52013..8ed52013 100644
--- a/libddekit/include/ddekit/thread.h
+++ b/libddekit/ddekit/thread.h
diff --git a/libddekit/include/ddekit/timer.h b/libddekit/ddekit/timer.h
index 387f2078..387f2078 100644
--- a/libddekit/include/ddekit/timer.h
+++ b/libddekit/ddekit/timer.h
diff --git a/libddekit/include/ddekit/types.h b/libddekit/ddekit/types.h
index 83d92c65..83d92c65 100644
--- a/libddekit/include/ddekit/types.h
+++ b/libddekit/ddekit/types.h
diff --git a/libddekit/memory.c b/libddekit/memory.c
index b4723b96..34b283b3 100644
--- a/libddekit/memory.c
+++ b/libddekit/memory.c
@@ -18,7 +18,7 @@
 #include <sys/mman.h>
 
 #include "mach_U.h"
-#include "libhurd-slab/slab.h"
+#include <hurd/slab.h>
 
 #include "util.h"
 #include "ddekit/memory.h"
diff --git a/libhurd-slab/Makefile b/libhurd-slab/Makefile
index 4682a934..f109f59b 100644
--- a/libhurd-slab/Makefile
+++ b/libhurd-slab/Makefile
@@ -21,7 +21,7 @@ makemode := library
 libname = libhurd-slab
 SRCS= slab.c
 LCLHDRS = slab.h
-installhdrs = 
+installhdrs = slab.h
 
 MIGSTUBS = 
 OBJS = $(sort $(SRCS:.c=.o) $(MIGSTUBS))
diff --git a/libmachdev/Makefile b/libmachdev/Makefile
index 224dfddb..ad090cae 100644
--- a/libmachdev/Makefile
+++ b/libmachdev/Makefile
@@ -24,13 +24,14 @@ SRCS = deviceUser.c machUser.c net.c ds_routines.c queue.c trivfs_server.c \
 LCLHDRS = dev_hdr.h device_emul.h ds_routines.h vm_param.h \
 	  util.h queue.h io_req.h if_ether.h machdev.h linux-errno.h \
 	  errno-base.h
-installhdrs = 
-HURDLIBS = ports threads trivfs
+installhdrs = machdev.h
+HURDLIBS = ports threads trivfs ddekit bpf
 OBJS = $(SRCS:.c=.o) $(MIGSTUBS)
 
 include ../Makeconf
 
-CFLAGS += -I$(top_srcdir)/libddekit/include -I$(top_srcdir)/libbpf
-
 ourdevice.defs: device.defs
 	$(CPP) $(CPPFLAGS) -x c $< | sed -e '/out[ 	]*device[ 	]*:[ 	]*device_t/s/device_t/mach_port_send_t/' > $@
+
+$(libname).so.$(hurd-version):
+	echo "INPUT ( $(libname).a )" > $@
diff --git a/libmachdev/if_hdr.h b/libmachdev/if_hdr.h
index 74d0fa8a..32497206 100644
--- a/libmachdev/if_hdr.h
+++ b/libmachdev/if_hdr.h
@@ -62,7 +62,7 @@
 
 #include <queue.h>
 #include <cthreads.h>
-#include <bpf_impl.h>
+#include <hurd/bpf_impl.h>
 
 #if 0
 /*