diff options
| author | Zheng Da <zhengda1936@gmail.com> | 2010-01-01 15:00:11 +0100 |
|---|---|---|
| committer | Zheng Da <zhengda1936@gmail.com> | 2010-01-01 15:00:11 +0100 |
| commit | 4acf279a6048d18fe3b9ca65d6e30f4544f6accf (patch) | |
| tree | 08346fd99af99f2e1681a8d092c14023a8d9d73a /libdde_linux26/mk | |
| parent | e87cd850f373309c7e71625a60fd0fbed6f16b88 (diff) | |
The modified Makefile can build libdde_linux26 now
Diffstat (limited to 'libdde_linux26/mk')
| -rw-r--r-- | libdde_linux26/mk/Makeconf | 9 | ||||
| -rw-r--r-- | libdde_linux26/mk/binary.inc | 16 | ||||
| -rw-r--r-- | libdde_linux26/mk/include.mk | 2 | ||||
| -rw-r--r-- | libdde_linux26/mk/modes.inc | 16 |
4 files changed, 26 insertions, 17 deletions
diff --git a/libdde_linux26/mk/Makeconf b/libdde_linux26/mk/Makeconf index 5a1e495c..4f377875 100644 --- a/libdde_linux26/mk/Makeconf +++ b/libdde_linux26/mk/Makeconf @@ -31,6 +31,9 @@ ifeq ($(origin _L4DIR_MK_MAKECONF),undefined) _L4DIR_MK_MAKECONF=y +SYSTEMS = x86-l4v2 +ARCH = x86 + # the default target is all all:: @@ -230,7 +233,7 @@ VPATH_SRC_BASE ?= $(SRC_DIR) MAKECONFLOCAL ?= Makeconf.local -include $(MAKECONFLOCAL) -DROPS_STDDIR ?= /home/drops +DROPS_STDDIR ?= /root/hurd/libdde_linux26/build ifeq ($(STATICFILE),) STATICFILE = $(OBJ_BASE)/pkg/STATIC $(L4DIR)/pkg/STATIC endif @@ -320,8 +323,8 @@ ifeq ($(USE_DIETLIBC),y) $(warning Dietlibc will soon be removed from the tree.) else # uClibc explicitly set for all architectures - DEFINES += -DUSE_UCLIBC=y - USE_UCLIBC = y + DEFINES += #-DUSE_UCLIBC=y + USE_UCLIBC = #y LIBC_TYPE = uc endif diff --git a/libdde_linux26/mk/binary.inc b/libdde_linux26/mk/binary.inc index 14da70a9..6525d1e6 100644 --- a/libdde_linux26/mk/binary.inc +++ b/libdde_linux26/mk/binary.inc @@ -155,11 +155,11 @@ all:: $(TARGET) disasm: $(TARGET) $(call DISASM_CMD,$<) -L4INCDIR ?= $(addprefix $(OBJ_BASE)/include/$(ARCH)/,$(L4API)) \ - $(addprefix $(OBJ_BASE)/include/,$(L4API)) \ - $(OBJ_BASE)/include/$(ARCH) \ +L4INCDIR ?= $(OBJ_BASE)/include/$(ARCH) \ $(OBJ_BASE)/include \ - $(DICE_INCDIR) \ +# $(addprefix $(OBJ_BASE)/include/$(ARCH)/,$(L4API)) \ +# $(addprefix $(OBJ_BASE)/include/,$(L4API)) \ +# $(DICE_INCDIR) \ $(addprefix $(DROPS_STDDIR)/include/$(ARCH)/,$(L4API)) \ $(addprefix $(DROPS_STDDIR)/include/,$(L4API)) \ $(DROPS_STDDIR)/include/$(ARCH) \ @@ -291,14 +291,20 @@ endif endif CPPFLAGS+= $(CPPFLAGS_$(OSYSTEM)) $(CPPFLAGS_$(<F)) $(CPPFLAGS_$(<F)_$(OSYSTEM)) +# defined in mk/Makeconf and this file. CPPFLAGS+= $(DEFINES) CPPFLAGS+= $(BID_CPPFLAGS_SYSCALLS) CPPFLAGS+= $(addprefix -I, $(PRIVATE_INCDIR) $(PRIVATE_INCDIR_$(OSYSTEM)) $(PRIVATE_INCDIR_$@) $(PRIVATE_INCDIR_$@_$(OSYSTEM))) -CPPFLAGS+= $(if $(CLIENTIDL)$(SERVERIDL)$(addprefix CLIENTIDL_,$(TARGET))$(addprefix SERVERIDL_,$(TARGET)),$(addprefix -I, $(IDL_PATH))) +CPPFLAGS+= -I. +#CPPFLAGS+= $(if $(CLIENTIDL)$(SERVERIDL)$(addprefix CLIENTIDL_,$(TARGET))$(addprefix SERVERIDL_,$(TARGET)),$(addprefix -I, $(IDL_PATH))) ifneq ($(MODE),host) CPPFLAGS+= $(addprefix -I, $(L4INCDIR)) endif CPPFLAGS+= $(LIBCINCDIR) +#CPPFLAGS+= -I/root/hurd/libddekit/include +#CPPFLAGS+= -I/root/hurd/libdde_linux26/include +#CPPFLAGS+= -I/root/hurd/libdde_linux26/contrib/include +#CPPFLAGS+= -I/root/hurd/libdde_linux26/contrib/arch/x86/include CXXFLAGS+= $(BID_CFLAGS_GSTAB) $(BID_CFLAGS_OMIT_FP) CXXFLAGS+= $(CXXFLAGS_$(OSYSTEM)) diff --git a/libdde_linux26/mk/include.mk b/libdde_linux26/mk/include.mk index 3e325cd4..4725374b 100644 --- a/libdde_linux26/mk/include.mk +++ b/libdde_linux26/mk/include.mk @@ -34,7 +34,7 @@ endif INSTALL_INC_PREFIX ?= l4/$(PKGNAME) INCSRC_DIR ?= $(SRC_DIR) -#include $(L4DIR)/mk/Makeconf +include $(L4DIR)/mk/Makeconf $(GENERAL_D_LOC): $(L4DIR)/mk/include.mk -include $(DEPSVAR) diff --git a/libdde_linux26/mk/modes.inc b/libdde_linux26/mk/modes.inc index d39d07f6..5cb1ef77 100644 --- a/libdde_linux26/mk/modes.inc +++ b/libdde_linux26/mk/modes.inc @@ -31,14 +31,14 @@ else LDS_LOADER = $(LDS_DEFAULT) endif -LIBC_INCLUDE = -nostdinc \ - -I$(OBJ_BASE)/include/$(ARCH)/uclibc \ - -I$(OBJ_BASE)/include/uclibc \ - -I$(OBJ_BASE)/include/uclibc++ \ - -I$(DROPS_STDDIR)/include/$(ARCH)/uclibc \ - -I$(DROPS_STDDIR)/include/uclibc \ - -I$(DROPS_STDDIR)/include/uclibc++ \ - $(I_GCCINCDIR) +#LIBC_INCLUDE = -nostdinc +# -I$(OBJ_BASE)/include/$(ARCH)/uclibc \ +# -I$(OBJ_BASE)/include/uclibc \ +# -I$(OBJ_BASE)/include/uclibc++ \ +# -I$(DROPS_STDDIR)/include/$(ARCH)/uclibc \ +# -I$(DROPS_STDDIR)/include/uclibc \ +# -I$(DROPS_STDDIR)/include/uclibc++ \ +# $(I_GCCINCDIR) LIBC_LIB = -luc_c ############################################################################# |