diff --git a/configure/CONFIG_ADDONS b/configure/CONFIG_ADDONS index 29a33c415..d32d91165 100644 --- a/configure/CONFIG_ADDONS +++ b/configure/CONFIG_ADDONS @@ -4,7 +4,7 @@ # Copyright (c) 2002 The Regents of the University of California, as # Operator of Los Alamos National Laboratory. # EPICS BASE is distributed subject to a Software License Agreement found -# in file LICENSE that is included with this distribution. +# in file LICENSE that is included with this distribution. #************************************************************************* # # check for add-on CFLAGS and CXXFLAGS @@ -37,9 +37,6 @@ # PROD_LIBS libs needed by PROD and TESTPROD # LIB_LIBS libs needed by shared LIBRARY # SHRLIB_LIBS libs needed by shared LIBRARY -# USR_OBJLIBS R3.13 vxWorks object libs needed building libraries and prods -# PROD_OBJLIBS R3.13 vxWorks object libs needed for building prods -# LIB_OBJLIBS R3.13 vxWorks object libs needed for building libraries # USR_SYS_LIBS system libs needed building libraries and prods # PROD_SYS_LIBS system libs needed for building prods # LIB_SYS_LIBS system libs needed for building libraries @@ -273,30 +270,6 @@ OBJS_HOST+=$(OBJS_HOST_DEFAULT) endif endif -ifneq ($(strip $(PROD_OBJLIBS_$(OS_CLASS))),) -PROD_OBJLIBS+=$(subst -nil-,,$(PROD_OBJLIBS_$(OS_CLASS))) -else -ifdef PROD_OBJLIBS_DEFAULT -PROD_OBJLIBS+=$(PROD_OBJLIBS_DEFAULT) -endif -endif - -ifneq ($(strip $(LIB_OBJLIBS_$(OS_CLASS))),) -LIB_OBJLIBS+=$(subst -nil-,,$(LIB_OBJLIBS_$(OS_CLASS))) -else -ifdef LIB_OBJLIBS_DEFAULT -LIB_OBJLIBS+=$(LIB_OBJLIBS_DEFAULT) -endif -endif - -ifneq ($(strip $(USR_OBJLIBS_$(OS_CLASS))),) -USR_OBJLIBS+=$(subst -nil-,,$(USR_OBJLIBS_$(OS_CLASS))) -else -ifdef USR_OBJLIBS_DEFAULT -USR_OBJLIBS+=$(USR_OBJLIBS_DEFAULT) -endif -endif - ifneq ($(strip $(LIB_OBJS_$(OS_CLASS))),) LIB_OBJS+=$(subst -nil-,,$(LIB_OBJS_$(OS_CLASS))) else @@ -581,4 +554,3 @@ ifdef LIB_RCS_DEFAULT LIB_RCS+=$(LIB_RCS_DEFAULT) endif endif - diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON index 79807c2f2..67cf33e1d 100644 --- a/configure/CONFIG_COMMON +++ b/configure/CONFIG_COMMON @@ -4,7 +4,7 @@ # Copyright (c) 2002 The Regents of the University of California, as # Operator of Los Alamos National Laboratory. # EPICS BASE is distributed subject to a Software License Agreement found -# in file LICENSE that is included with this distribution. +# in file LICENSE that is included with this distribution. #************************************************************************* # # CONFIG_COMMON @@ -163,13 +163,13 @@ TESTSHRLIBNAME = $(TESTSHRLIBNAME_$(SHARED_LIBRARIES)) #-------------------------------------------------- # obj files -TARGET_OBJS = $($*_OBJLIBS) $($*_LDOBJS) $(addsuffix $(OBJ),$(basename $($*_OBJS) $($*_SRCS))) +TARGET_OBJS = $($*_LDOBJS) $(addsuffix $(OBJ),$(basename $($*_OBJS) $($*_SRCS))) PRODUCT_OBJS = $(addsuffix $(OBJ),$(basename $(SRCS) $(USR_SRCS) $(PROD_SRCS) $(USR_OBJS) $(PROD_OBJS))) -PROD_LD_OBJS = $(USR_OBJLIBS) $(PROD_OBJLIBS) $(TARGET_OBJS) $(PRODUCT_OBJS) +PROD_LD_OBJS = $(TARGET_OBJS) $(PRODUCT_OBJS) LIBRARY_OBJS = $(addsuffix $(OBJ),$(basename $(SRCS) $(USR_SRCS) $(LIB_SRCS) $(LIBSRCS) $(USR_OBJS) $(LIB_OBJS))) -LIBRARY_LD_OBJS = $(USR_OBJLIBS) $(LIB_OBJLIBS) $(TARGET_OBJS) $(LIBRARY_OBJS) +LIBRARY_LD_OBJS = $(TARGET_OBJS) $(LIBRARY_OBJS) #-------------------------------------------------- # Windows resource files @@ -261,7 +261,7 @@ LIBRARY_SRCS=$(basename $(foreach lib,$(LIBRARY) $(TESTLIBRARY) $(LOADABLE_LIBRA LIBRARY_SRC_CFLAGS=$($(patsubst $*,SHRLIB,$(findstring $*,$(LIBRARY_SRCS)))_CFLAGS) #-------------------------------------------------- -# prefix, suffix, and ldflags for loadable shared libraries +# prefix, suffix, and ldflags for loadable shared libraries TARGET_LIB_LDFLAGS=$($(patsubst $*,LOADABLE_,$(findstring $*,$(LOADABLE_LIBRARY)))SHRLIB_LDFLAGS) LOADABLE_SHRLIB_PREFIX=$(SHRLIB_PREFIX) LOADABLE_SHRLIB_SUFFIX=$(SHRLIB_SUFFIX) @@ -459,5 +459,5 @@ COMMON_INC += $(filter $(COMMON_DIR)/%, $(foreach file, $(INC), \ SOURCE_INC = $(wildcard $(file) $(SOURCE_INC_bbb) ) SOURCE_INC_bbb = $(foreach dir, $(ALL_SRC_DIRS), $(SOURCE_INC_aaa) ) SOURCE_INC_aaa = $(addsuffix /$(file), $(dir) ) - + endif diff --git a/configure/RULES_TARGET b/configure/RULES_TARGET index 4e9cb6e05..7a5dcba81 100644 --- a/configure/RULES_TARGET +++ b/configure/RULES_TARGET @@ -20,7 +20,7 @@ $(1)_$(2) += $$(if $$(strip $$($(1)_$(2)_$$(OS_CLASS))), \ $$($(1)_$(2)_DEFAULT)) endef -$(foreach type, SRCS RCS OBJS LDFLAGS OBJLIBS LDOBJS SYS_LIBS , \ +$(foreach type, SRCS RCS OBJS LDFLAGS LDOBJS SYS_LIBS , \ $(foreach target, $(PROD) $(TESTPROD) $(LIBRARY) $(TESTLIBRARY) $(LOADABLE_LIBRARY) , \ $(eval $(call TARGET_template,$(strip $(target)),$(type))))) @@ -152,4 +152,3 @@ $(foreach target, $(LOADABLE_LIBRARY), \ $(eval $(call LOADABLE_LIBRARY_template,$(strip $(target))))) #----------------------------------------------------------------------- -