summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2020-03-31 02:16:27 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2020-03-31 02:16:27 +0200
commit0b0b9a7561c2f345d9f8597f16004c8b1a0aa3e4 (patch)
treec15e793b4606bba0a20cd52c0a35c112a4b35cbf
parent39de1ea0c62ba7aeed8aef3cfdb51f9ae9f11326 (diff)
Also link against libmachdev
* Makeconf.local (libmachdev_path): Restore. * Makefile (LIBS): Restore libmachdev_path.
-rw-r--r--Makeconf.local1
-rw-r--r--Makefile2
2 files changed, 2 insertions, 1 deletions
diff --git a/Makeconf.local b/Makeconf.local
index 9ccb77189..92cc60f79 100644
--- a/Makeconf.local
+++ b/Makeconf.local
@@ -5,6 +5,7 @@ SYSTEM = x86-l4v2
BUILDDIR ?= ..
libmachdevdde_path := -L$(BUILDDIR)/libmachdevdde -lmachdevdde
+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/Makefile b/Makefile
index 310bee28f..1be14465e 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ TARGET = netdde
SRC_C = main.c machdev.c check_kernel.c
-LIBS += $(libmachdevdde_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lz -lpthread -lshouldbeinlibc -lports $(libslab_path) $(libbpf_path)
+LIBS += $(libmachdevdde_path) $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lz -lpthread -lshouldbeinlibc -lports $(libslab_path) $(libbpf_path)
CFLAGS += -g -I$(PKGDIR)/include -I$(BUILDDIR)/include
LDFLAGS += -g