summaryrefslogtreecommitdiff
path: root/libmachdev
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2012-02-22 01:50:58 +0000
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2012-02-22 01:50:58 +0000
commit258642ef93bda485b8904cfe47ab34644247229e (patch)
treeb68068a7f8b5ae8b346a4f8855459e73ed4a0d01 /libmachdev
parent2d149d8feae502439c5f21a6290c8a3ac7b18434 (diff)
parenta6a2e4c910172d8309d38b914459d9b41509c411 (diff)
Merge branch 'dde' into dde-clean
Diffstat (limited to 'libmachdev')
-rw-r--r--libmachdev/Makefile4
-rw-r--r--libmachdev/if_hdr.h2
2 files changed, 2 insertions, 4 deletions
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
/*