summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dde_e100/Makeconf.local20
-rw-r--r--dde_e100/Makefile6
-rw-r--r--dde_e100/main.c2
-rw-r--r--dde_e1000/Makeconf.local20
-rw-r--r--dde_e1000/Makefile6
-rw-r--r--dde_e1000/main.c2
-rw-r--r--dde_ne2k_pci/Makeconf.local20
-rw-r--r--dde_ne2k_pci/Makefile4
-rw-r--r--dde_ne2k_pci/main.c2
-rw-r--r--dde_pcnet32/Makeconf.local20
-rw-r--r--dde_pcnet32/Makefile6
-rw-r--r--dde_pcnet32/main.c2
-rw-r--r--dde_rtl8139/Makeconf.local20
-rw-r--r--dde_rtl8139/Makefile4
-rw-r--r--dde_rtl8139/main.c2
15 files changed, 115 insertions, 21 deletions
diff --git a/dde_e100/Makeconf.local b/dde_e100/Makeconf.local
index 3d03134b..c52bc65c 100644
--- a/dde_e100/Makeconf.local
+++ b/dde_e100/Makeconf.local
@@ -2,6 +2,26 @@ SYSTEMS = x86-l4v2
ARCH = x86
SYSTEM = x86-l4v2
+BUILDDIR ?=
+
+libmachdev_path := ../libmachdev/libmachdev.a
+has_libmachdev := $(wildcard $(libmachdev_path))
+ifeq ($(strip $(has_libmachdev)),)
+ libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a
+endif
+
+libddekit_path := ../libddekit/libddekit.a
+has_libddekit := $(wildcard $(libddekit_path))
+ifeq ($(strip $(has_libddekit)),)
+ libddekit_path := $(BUILDDIR)/libddekit/libddekit.a
+endif
+
+libslab_path := ../libhurd-slab/libhurd-slab.a
+has_libslab := $(wildcard $(libslab_path))
+ifeq ($(strip $(has_libslab)),)
+ libslab_path := $(BUILDDIR)/libhurd-slab/libhurd-slab.a
+endif
+
DDEKITLIBDIR = $(PKGDIR)/../libddekit/
DDEKITINCDIR = $(PKGDIR)/../libddekit/include
DDE26LIBDIR = $(PKGDIR)/lib/src
diff --git a/dde_e100/Makefile b/dde_e100/Makefile
index 27504068..eee7043a 100644
--- a/dde_e100/Makefile
+++ b/dde_e100/Makefile
@@ -1,16 +1,14 @@
PKGDIR ?= ../libdde_linux26
L4DIR ?= $(PKGDIR)
-SYSTEMS = x86-l4v2
-
include Makeconf.local
TARGET = dde_e100
SRC_C = main.c e100.c
-LIBS += ../libmachdev/libmachdev.a -ldde_linux26.o -ldde_linux26_net ../libddekit/libddekit.a -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports -lhurd-slab
-CFLAGS += -g -I/include
+LIBS += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports $(libslab_path)
+CFLAGS += -g -I$(PKGDIR)/include -I../libmachdev
# DDE configuration
include $(L4DIR)/Makeconf
diff --git a/dde_e100/main.c b/dde_e100/main.c
index 98f4452a..63ab182f 100644
--- a/dde_e100/main.c
+++ b/dde_e100/main.c
@@ -6,7 +6,7 @@
#include <linux/init.h> // initcall()
#include <linux/delay.h> // msleep()
-#include <hurd/machdev.h>
+#include <machdev.h>
int using_std = 1;
diff --git a/dde_e1000/Makeconf.local b/dde_e1000/Makeconf.local
index 3d03134b..5b2e9082 100644
--- a/dde_e1000/Makeconf.local
+++ b/dde_e1000/Makeconf.local
@@ -2,6 +2,26 @@ SYSTEMS = x86-l4v2
ARCH = x86
SYSTEM = x86-l4v2
+BUILDDIR ?=
+
+libmachdev_path := ../libmachdev/libmachdev.a
+has_libmachdev := $(wildcard $(libmachdev_path))
+ifeq ($(strip $(has_libmachdev)),)
+ libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a
+endif
+
+libddekit_path := ../libddekit/libddekit.a
+has_libddekit := $(wildcard $(libddekit_path))
+ifeq ($(strip $(has_libddekit)),)
+ libddekit_path := $(BUILDDIR)/libddekit/libddekit.a
+endif
+
+libslab_path := ../libhurd-slab/libhurd-slab.a
+has_libslab := $(wildcard $(libslab_path))
+ifeq ($(strip $(has_libslab)),)
+ libslab_path := $(BUILDDIR)/libhurd-slab/libhurd-slab.a
+endif
+
DDEKITLIBDIR = $(PKGDIR)/../libddekit/
DDEKITINCDIR = $(PKGDIR)/../libddekit/include
DDE26LIBDIR = $(PKGDIR)/lib/src
diff --git a/dde_e1000/Makefile b/dde_e1000/Makefile
index ffdc17ab..ea73128d 100644
--- a/dde_e1000/Makefile
+++ b/dde_e1000/Makefile
@@ -1,16 +1,14 @@
PKGDIR ?= ../libdde_linux26
L4DIR ?= $(PKGDIR)
-SYSTEMS = x86-l4v2
-
include Makeconf.local
TARGET = dde_e1000
SRC_C = main.c e1000_ethtool.c e1000_hw.c e1000_main.c e1000_param.c
-LIBS += ../libmachdev/libmachdev.a -ldde_linux26.o -ldde_linux26_net ../libddekit/libddekit.a -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports -lhurd-slab
-CFLAGS += -g -I/include
+LIBS += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports $(libslab_path)
+CFLAGS += -g -I$(PKGDIR)/include -I../libmachdev
# DDE configuration
include $(L4DIR)/Makeconf
diff --git a/dde_e1000/main.c b/dde_e1000/main.c
index 98f4452a..63ab182f 100644
--- a/dde_e1000/main.c
+++ b/dde_e1000/main.c
@@ -6,7 +6,7 @@
#include <linux/init.h> // initcall()
#include <linux/delay.h> // msleep()
-#include <hurd/machdev.h>
+#include <machdev.h>
int using_std = 1;
diff --git a/dde_ne2k_pci/Makeconf.local b/dde_ne2k_pci/Makeconf.local
index 3d03134b..5b2e9082 100644
--- a/dde_ne2k_pci/Makeconf.local
+++ b/dde_ne2k_pci/Makeconf.local
@@ -2,6 +2,26 @@ SYSTEMS = x86-l4v2
ARCH = x86
SYSTEM = x86-l4v2
+BUILDDIR ?=
+
+libmachdev_path := ../libmachdev/libmachdev.a
+has_libmachdev := $(wildcard $(libmachdev_path))
+ifeq ($(strip $(has_libmachdev)),)
+ libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a
+endif
+
+libddekit_path := ../libddekit/libddekit.a
+has_libddekit := $(wildcard $(libddekit_path))
+ifeq ($(strip $(has_libddekit)),)
+ libddekit_path := $(BUILDDIR)/libddekit/libddekit.a
+endif
+
+libslab_path := ../libhurd-slab/libhurd-slab.a
+has_libslab := $(wildcard $(libslab_path))
+ifeq ($(strip $(has_libslab)),)
+ libslab_path := $(BUILDDIR)/libhurd-slab/libhurd-slab.a
+endif
+
DDEKITLIBDIR = $(PKGDIR)/../libddekit/
DDEKITINCDIR = $(PKGDIR)/../libddekit/include
DDE26LIBDIR = $(PKGDIR)/lib/src
diff --git a/dde_ne2k_pci/Makefile b/dde_ne2k_pci/Makefile
index 879904e1..32a64d27 100644
--- a/dde_ne2k_pci/Makefile
+++ b/dde_ne2k_pci/Makefile
@@ -9,8 +9,8 @@ TARGET = dde_ne2k_pci
SRC_C = main.c ne2k-pci.c 8390.c
-LIBS += ../libmachdev/libmachdev.a -ldde_linux26.o -ldde_linux26_net ../libddekit/libddekit.a -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports -lhurd-slab
-CFLAGS += -g -I/include
+LIBS += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports $(libslab_path)
+CFLAGS += -g -I$(PKGDIR)/include -I../libmachdev
# DDE configuration
include $(L4DIR)/Makeconf
diff --git a/dde_ne2k_pci/main.c b/dde_ne2k_pci/main.c
index 98f4452a..63ab182f 100644
--- a/dde_ne2k_pci/main.c
+++ b/dde_ne2k_pci/main.c
@@ -6,7 +6,7 @@
#include <linux/init.h> // initcall()
#include <linux/delay.h> // msleep()
-#include <hurd/machdev.h>
+#include <machdev.h>
int using_std = 1;
diff --git a/dde_pcnet32/Makeconf.local b/dde_pcnet32/Makeconf.local
index 3d03134b..5b2e9082 100644
--- a/dde_pcnet32/Makeconf.local
+++ b/dde_pcnet32/Makeconf.local
@@ -2,6 +2,26 @@ SYSTEMS = x86-l4v2
ARCH = x86
SYSTEM = x86-l4v2
+BUILDDIR ?=
+
+libmachdev_path := ../libmachdev/libmachdev.a
+has_libmachdev := $(wildcard $(libmachdev_path))
+ifeq ($(strip $(has_libmachdev)),)
+ libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a
+endif
+
+libddekit_path := ../libddekit/libddekit.a
+has_libddekit := $(wildcard $(libddekit_path))
+ifeq ($(strip $(has_libddekit)),)
+ libddekit_path := $(BUILDDIR)/libddekit/libddekit.a
+endif
+
+libslab_path := ../libhurd-slab/libhurd-slab.a
+has_libslab := $(wildcard $(libslab_path))
+ifeq ($(strip $(has_libslab)),)
+ libslab_path := $(BUILDDIR)/libhurd-slab/libhurd-slab.a
+endif
+
DDEKITLIBDIR = $(PKGDIR)/../libddekit/
DDEKITINCDIR = $(PKGDIR)/../libddekit/include
DDE26LIBDIR = $(PKGDIR)/lib/src
diff --git a/dde_pcnet32/Makefile b/dde_pcnet32/Makefile
index ebbb271e..9543477a 100644
--- a/dde_pcnet32/Makefile
+++ b/dde_pcnet32/Makefile
@@ -1,16 +1,14 @@
PKGDIR ?= ../libdde_linux26
L4DIR ?= $(PKGDIR)
-SYSTEMS = x86-l4v2
-
include Makeconf.local
TARGET = dde_pcnet32
SRC_C = main.c pcnet32.c
-LIBS += ../libmachdev/libmachdev.a -ldde_linux26.o -ldde_linux26_net ../libddekit/libddekit.a -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports -lhurd-slab
-CFLAGS += -g -I/include
+LIBS += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports $(libslab_path)
+CFLAGS += -g -I$(PKGDIR)/include -I../libmachdev
# DDE configuration
include $(L4DIR)/Makeconf
diff --git a/dde_pcnet32/main.c b/dde_pcnet32/main.c
index 98f4452a..63ab182f 100644
--- a/dde_pcnet32/main.c
+++ b/dde_pcnet32/main.c
@@ -6,7 +6,7 @@
#include <linux/init.h> // initcall()
#include <linux/delay.h> // msleep()
-#include <hurd/machdev.h>
+#include <machdev.h>
int using_std = 1;
diff --git a/dde_rtl8139/Makeconf.local b/dde_rtl8139/Makeconf.local
index 3d03134b..5b2e9082 100644
--- a/dde_rtl8139/Makeconf.local
+++ b/dde_rtl8139/Makeconf.local
@@ -2,6 +2,26 @@ SYSTEMS = x86-l4v2
ARCH = x86
SYSTEM = x86-l4v2
+BUILDDIR ?=
+
+libmachdev_path := ../libmachdev/libmachdev.a
+has_libmachdev := $(wildcard $(libmachdev_path))
+ifeq ($(strip $(has_libmachdev)),)
+ libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a
+endif
+
+libddekit_path := ../libddekit/libddekit.a
+has_libddekit := $(wildcard $(libddekit_path))
+ifeq ($(strip $(has_libddekit)),)
+ libddekit_path := $(BUILDDIR)/libddekit/libddekit.a
+endif
+
+libslab_path := ../libhurd-slab/libhurd-slab.a
+has_libslab := $(wildcard $(libslab_path))
+ifeq ($(strip $(has_libslab)),)
+ libslab_path := $(BUILDDIR)/libhurd-slab/libhurd-slab.a
+endif
+
DDEKITLIBDIR = $(PKGDIR)/../libddekit/
DDEKITINCDIR = $(PKGDIR)/../libddekit/include
DDE26LIBDIR = $(PKGDIR)/lib/src
diff --git a/dde_rtl8139/Makefile b/dde_rtl8139/Makefile
index 1af8e179..9c490a8f 100644
--- a/dde_rtl8139/Makefile
+++ b/dde_rtl8139/Makefile
@@ -9,8 +9,8 @@ TARGET = dde_rtl8139
SRC_C = main.c 8139cp.c
-LIBS += ../libmachdev/libmachdev.a -ldde_linux26.o -ldde_linux26_net ../libddekit/libddekit.a -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports -lhurd-slab
-CFLAGS += -g -I/include
+LIBS += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports $(libslab_path)
+CFLAGS += -g -I$(PKGDIR)/include -I../libmachdev
# DDE configuration
include $(L4DIR)/Makeconf
diff --git a/dde_rtl8139/main.c b/dde_rtl8139/main.c
index 98f4452a..63ab182f 100644
--- a/dde_rtl8139/main.c
+++ b/dde_rtl8139/main.c
@@ -6,7 +6,7 @@
#include <linux/init.h> // initcall()
#include <linux/delay.h> // msleep()
-#include <hurd/machdev.h>
+#include <machdev.h>
int using_std = 1;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-16 20:46:08 +0000