From 7c57ed82c9f83c065fc7265c02be2c589bd82cd3 Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Fri, 24 Jan 2003 17:46:01 +0000 Subject: [PATCH] Added USR_SRCS --- configure/CONFIG_ADDONS | 9 +++++++++ configure/CONFIG_COMMON | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/configure/CONFIG_ADDONS b/configure/CONFIG_ADDONS index f07a0e786..dad52d1b0 100644 --- a/configure/CONFIG_ADDONS +++ b/configure/CONFIG_ADDONS @@ -41,6 +41,7 @@ # USR_CXXFLAGS C++ flags # USR_CPPFLAGS c preprocesser flags # INC include-files to install +# USR_SRCS source files for building library and prod # LIBSRCS source files for building library # LIB_SRCS source files for building library # SHRLIB_LIBS libs needed by shared LIBRARY @@ -160,6 +161,14 @@ SRCS+=$(SRCS_DEFAULT) endif endif +ifneq ($(strip $(USR_SRCS_$(OS_CLASS))),) +USR_SRCS += $(subst -nil-,,$(USR_SRCS_$(OS_CLASS))) +else +ifdef USR_SRCS_DEFAULT +USR_SRCS+=$(USR_SRCS_DEFAULT) +endif +endif + ifneq ($(strip $(PROD_SRCS_$(OS_CLASS))),) PROD_SRCS += $(subst -nil-,,$(PROD_SRCS_$(OS_CLASS))) else diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON index 34789d998..8f1e0a41f 100644 --- a/configure/CONFIG_COMMON +++ b/configure/CONFIG_COMMON @@ -142,10 +142,10 @@ JAR = TARGET_OBJS = $($*_LDOBJS) $(addsuffix $(OBJ),$(basename $($*_OBJS))) -PRODUCT_OBJS = $(addsuffix $(OBJ),$(basename $(SRCS) $(PROD_SRCS) $(PROD_OBJS))) +PRODUCT_OBJS = $(addsuffix $(OBJ),$(basename $(SRCS) $(USR_SRCS) $(PROD_SRCS) $(PROD_OBJS))) PROD_LD_OBJS = $(LDOBJS) $(TARGET_OBJS) $(PRODUCT_OBJS) -LIBRARY_OBJS = $(addsuffix $(OBJ),$(basename $(SRCS) $(LIB_SRCS) $(LIBSRCS) $(LIB_OBJS))) +LIBRARY_OBJS = $(addsuffix $(OBJ),$(basename $(SRCS) $(USR_SRCS) $(LIB_SRCS) $(LIBSRCS) $(LIB_OBJS))) LIBRARY_LD_OBJS = $(LDOBJS) $(TARGET_OBJS) $(LIBRARY_OBJS) #-------------------------------------------------- @@ -299,7 +299,7 @@ HDEPENDS_CMD = $(HDEPENDS_CMD_$(HDEPENDS)) # depends definition TARGET_SRCS = $(foreach name, $(TESTPROD) $(PROD) $(LIBRARY), $($(name)_SRCS)) -SRC_FILES = $(LIB_SRCS) $(LIBSRCS) $(SRCS) $(PROD_SRCS) $(TARGET_SRCS) +SRC_FILES = $(LIB_SRCS) $(LIBSRCS) $(SRCS) $(USR_SRCS) $(PROD_SRCS) $(TARGET_SRCS) HDEPENDS_FILES_YES = $(addsuffix $(DEP),$(notdir $(basename $(SRC_FILES)))) HDEPENDS_FILES = $(HDEPENDS_FILES_$(HDEPENDS))