diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-02-19 18:00:14 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-02-19 18:00:14 +0000 |
| commit | 871cd76365ed6ef9fa89282e31e21f20d6c1db62 (patch) | |
| tree | efdef5ed8f6631d63303b5cb4b190dc3a1ec93eb | |
| parent | 0e616a4050d7f15a3aab1244dd4cb06a779d9205 (diff) | |
| parent | 2d2eca01fc2fd15821fb6f5fc1c281d06636b7d5 (diff) | |
Merge branch 'dde' into upstream-merged
| -rw-r--r-- | dde_e100/Makeconf.local | 4 | ||||
| -rw-r--r-- | dde_e1000/Makeconf.local | 4 | ||||
| -rw-r--r-- | dde_ne2k_pci/Makeconf.local | 4 | ||||
| -rw-r--r-- | dde_pcnet32/Makeconf.local | 4 | ||||
| -rw-r--r-- | dde_rtl8139/Makeconf.local | 4 | ||||
| -rw-r--r-- | libddekit/Makefile | 3 | ||||
| -rw-r--r-- | libmachdev/Makefile | 3 |
7 files changed, 16 insertions, 10 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_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_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_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_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/libddekit/Makefile b/libddekit/Makefile index 58dbd555..3dbaeeee 100644 --- a/libddekit/Makefile +++ b/libddekit/Makefile @@ -45,3 +45,6 @@ include ../Makeconf LDFLAGS += -lpciaccess CFLAGS += -I$(srcdir)/include + +$(libname).so.$(hurd-version): + echo "INPUT ( $(libname).a )" > $@ diff --git a/libmachdev/Makefile b/libmachdev/Makefile index 1af90204..15bc9730 100644 --- a/libmachdev/Makefile +++ b/libmachdev/Makefile @@ -34,3 +34,6 @@ 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 )" > $@ |