diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-04-08 02:31:00 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-04-08 02:31:00 +0200 |
| commit | fcdea94c3fddd42de30e6294b02fc3fa869c888e (patch) | |
| tree | 170c7320a73a56864c1f0e69324071b93420227e /libmachdev | |
| parent | 19796a75ab8ba43b31e230ea169d5383c6392bfc (diff) | |
| parent | c0c35f90e218835ef0f8c0b67399ad6533763ed0 (diff) | |
Merge branch 'upstream-merged' of git.debian.org:/git/pkg-hurd/hurd into upstream-merged
Conflicts:
pfinet/ethernet.c
Diffstat (limited to 'libmachdev')
| -rw-r--r-- | libmachdev/Makefile | 9 | ||||
| -rw-r--r-- | libmachdev/if_hdr.h | 2 |
2 files changed, 6 insertions, 5 deletions
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 /* |