From 0d540cbe80276303d9cf1012da97f44d65285288 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sun, 19 Feb 2012 17:51:04 +0000 Subject: Prevent dynamic linking --- libddekit/Makefile | 3 +++ libmachdev/Makefile | 3 +++ 2 files changed, 6 insertions(+) diff --git a/libddekit/Makefile b/libddekit/Makefile index a163a0c0..8ba581ec 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 )" > $@ -- cgit v1.2.3 From 2d2eca01fc2fd15821fb6f5fc1c281d06636b7d5 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sun, 19 Feb 2012 17:53:30 +0000 Subject: Simply use -l to link libmachdev and libddekit --- dde_e100/Makeconf.local | 4 ++-- dde_e1000/Makeconf.local | 4 ++-- dde_ne2k_pci/Makeconf.local | 4 ++-- dde_pcnet32/Makeconf.local | 4 ++-- dde_rtl8139/Makeconf.local | 4 ++-- 5 files changed, 10 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 -- cgit v1.2.3