diff options
| author | Zheng Da <zhengda1936@gmail.com> | 2010-06-15 17:50:34 +0200 |
|---|---|---|
| committer | Zheng Da <zhengda1936@gmail.com> | 2010-06-15 17:50:34 +0200 |
| commit | e0c7d9e618426c0cf8764a6ff126af6ea638e0b1 (patch) | |
| tree | ffebe0df8a6d6f534078bb49675d619ede4a1428 /dde_e100 | |
| parent | 9cd3c840876b1f3ea79ab810a5b00d9931749631 (diff) | |
handle the case hurd is built in a separate dir.
if hurd is built in its source tree, nothing needs to be changed.
but if hurd is built in a separate directory, BUILDDIR has to specify
the path where hurd is built.
Diffstat (limited to 'dde_e100')
| -rw-r--r-- | dde_e100/Makeconf.local | 20 | ||||
| -rw-r--r-- | dde_e100/Makefile | 6 | ||||
| -rw-r--r-- | dde_e100/main.c | 2 |
3 files changed, 23 insertions, 5 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; |