a temporary version of Makefiles for libdde_linux26

4 files changed, 36 insertions, 43 deletions

diff --git a/libdde_linux26/mk/Makeconf b/libdde_linux26/mk/Makeconf
index 1c927e45..5a1e495c 100644
--- a/libdde_linux26/mk/Makeconf
+++ b/libdde_linux26/mk/Makeconf
@@ -139,19 +139,19 @@ findfile	= $(firstword $(wildcard $(addsuffix /$(1),$(2))) $(1)_NOT_FOUND)
 # include this one early to be able to set OBJ_BASE
 -include $(L4DIR)/Makeconf.local
 
-ifeq ($(filter $(IGNORE_OBJDIR_TARGETS),$(MAKECMDGOALS)),)
+#ifeq ($(filter $(IGNORE_OBJDIR_TARGETS),$(MAKECMDGOALS)),)
 # output directory
-ifeq ($(O)$(OBJ_BASE),)
-$(error need to give builddir with O=.../builddir)
-else
-ifneq ($(O),)
-ifeq ($(origin OBJ_BASE),undefined)
-OBJ_BASE := $(call absfilename, $(O))
-export OBJ_BASE
-endif
-endif
-endif
-endif
+#ifeq ($(O)$(OBJ_BASE),)
+#$(error need to give builddir with O=.../builddir)
+#else
+#ifneq ($(O),)
+#ifeq ($(origin OBJ_BASE),undefined)
+#OBJ_BASE := $(call absfilename, $(O))
+#export OBJ_BASE
+#endif
+#endif
+#endif
+#endif
 
 ifeq ($(origin L4DIR_ABS),undefined)
 L4DIR_ABS      := $(call absfilename,$(L4DIR))
@@ -207,25 +207,25 @@ VPATH_SRC_BASE ?= $(SRC_DIR)
 
 # Makeconf.local handling
 # dont use -include here, as we have special build conditions in $(L4DIR)/
-ifeq ($(origin BID_ROOT_CONF),undefined)
-BID_ROOT_CONF := $(call absfilename, $(OBJ_BASE))/Makeconf.bid.local
-endif
-ifeq ($(filter $(IGNORE_OBJDIR_TARGETS),$(MAKECMDGOALS)),)
-ifeq ($(wildcard $(BID_ROOT_CONF)),)
-ifeq ($(BID_IGN_ROOT_CONF),)
-$(error No configuration file found in build directory "$(OBJ_BASE)". Please run "make O=/path/to/objdir config" in "$(L4DIR_ABS)" or specify a valid build directory)
-endif
-else
-include $(BID_ROOT_CONF)
-endif
-endif
-
--include $(L4DIR)/Makeconf.$(CONFIG_LABEL)
-
--include $(OBJ_BASE)/Makeconf.local
-ifneq ($(PKGDIR),)
--include $(PKGDIR)/Makeconf.local
-endif
+#ifeq ($(origin BID_ROOT_CONF),undefined)
+#BID_ROOT_CONF := $(call absfilename, $(OBJ_BASE))/Makeconf.bid.local
+#endif
+#ifeq ($(filter $(IGNORE_OBJDIR_TARGETS),$(MAKECMDGOALS)),)
+#ifeq ($(wildcard $(BID_ROOT_CONF)),)
+#ifeq ($(BID_IGN_ROOT_CONF),)
+#$(error No configuration file found in build directory "$(OBJ_BASE)". Please run "make O=/path/to/objdir config" in "$(L4DIR_ABS)" or specify a valid build directory)
+#endif
+#else
+#include $(BID_ROOT_CONF)
+#endif
+#endif
+
+#-include $(L4DIR)/Makeconf.$(CONFIG_LABEL)
+
+#-include $(OBJ_BASE)/Makeconf.local
+#ifneq ($(PKGDIR),)
+#-include $(PKGDIR)/Makeconf.local
+#endif
 # if it is not already set, we use this in the local dir
 MAKECONFLOCAL ?= Makeconf.local
 -include $(MAKECONFLOCAL)
@@ -248,7 +248,7 @@ PL_j := -j $(PL)
 export PL
 endif
 
-include $(L4DIR)/mk/config.inc
+#include $(L4DIR)/mk/config.inc
 
 ifeq ($(HAVE_LDSO),y)
 # MAKEDEP-call:
diff --git a/libdde_linux26/mk/include.mk b/libdde_linux26/mk/include.mk
index 4725374b..3e325cd4 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/lib.mk b/libdde_linux26/mk/lib.mk
index 3ae24dbe..c96fcaaf 100644
--- a/libdde_linux26/mk/lib.mk
+++ b/libdde_linux26/mk/lib.mk
@@ -16,6 +16,7 @@ ifeq ($(origin _L4DIR_MK_LIB_MK),undefined)
 _L4DIR_MK_LIB_MK=y
 
 ROLE = lib.mk
+SYSTEM = x86-l4v2
 
 # define INSTALLDIRs prior to including install.inc, where the install-
 # rules are defined. Same for INSTALLDIR.
@@ -60,7 +61,7 @@ LDFLAGS	+= $(LIBS) $(LDFLAGS_$@) $(LDNOSTDLIB)
 LDSCRIPT = $(call findfile,main_rel.ld,$(L4LIBDIR))
 
 # install.inc eventually defines rules for every target
-include $(L4DIR)/mk/install.inc
+#include $(L4DIR)/mk/install.inc
 
 DEPS	+= $(foreach file,$(TARGET), $(dir $(file)).$(notdir $(file)).d)
 
diff --git a/libdde_linux26/mk/subdir.mk b/libdde_linux26/mk/subdir.mk
index 0f31b2d1..176200fe 100644
--- a/libdde_linux26/mk/subdir.mk
+++ b/libdde_linux26/mk/subdir.mk
@@ -6,18 +6,10 @@
 #
 # 05/2002 Jork Loeser <jork.loeser@inf.tu-dresden.de>
 
-include $(L4DIR)/mk/Makeconf
+#include $(L4DIR)/mk/Makeconf
 
-ifeq ($(PKGDIR),.)
-TARGET ?= $(patsubst %/Makefile,%,$(wildcard $(addsuffix /Makefile, \
-	idl include src lib server examples doc)))
-$(if $(wildcard include/Makefile), idl lib server examples: include)
-$(if $(wildcard idl/Makefile), lib server examples: idl)
-$(if $(wildcard lib/Makefile), server examples: lib)
-else
 TARGET ?= $(patsubst %/Makefile,%,$(wildcard $(addsuffix /Makefile, \
 	idl src lib server examples doc)))
-endif
 SUBDIR_TARGET	:= $(if $(filter doc,$(MAKECMDGOALS)),$(TARGET),    \
 			$(filter-out doc,$(TARGET)))