From 0d6bc97a073fc3aacd0cc4ff417edf6d5f79a25c Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Tue, 21 Feb 2012 23:37:19 +0000
Subject: Clean up includes

To use the standard hurd Makeconf rules and permit external dde_* build

Conflicts:

	dde_e100/Makefile
	dde_e1000/Makefile
	dde_ne2k_pci/Makefile
	dde_pcnet32/Makefile
	dde_rtl8139/Makefile
---
 libmachdev/Makefile | 4 +---
 libmachdev/if_hdr.h | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'libmachdev')

diff --git a/libmachdev/Makefile b/libmachdev/Makefile
index 15bc9730..ad090cae 100644
--- a/libmachdev/Makefile
+++ b/libmachdev/Makefile
@@ -25,13 +25,11 @@ 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 = machdev.h
-HURDLIBS = ports threads trivfs
+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/' > $@
 
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
 /*
-- 
cgit v1.2.3