From 48a4f6d39a495d458f191ded3a1007bd1e9a455d Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Mon, 25 Sep 2000 19:42:24 +0000 Subject: [PATCH] Changed TARGET_RESS, ARCMD, DEPENDS_RULE. Added SRC_FILES definition. --- configure/CONFIG_COMMON | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON index 833f8b64a..45183c461 100644 --- a/configure/CONFIG_COMMON +++ b/configure/CONFIG_COMMON @@ -150,7 +150,7 @@ LIBRARY_LD_OBJS = $(TARGET_OBJS) $(LIBRARY_OBJS) #-------------------------------------------------- # resource(WIN32) files -TARGET_RESS = $(addsuffix $(RES),$(basename $($*_RESS))) +TARGET_RESS = $(addsuffix $(RES),$(basename $($*_RCS))) PROD_RESS = $(addsuffix $(RES),$(basename $(RCS) $(PROD_RCS))) PROD_LD_RESS = $(TARGET_RESS) $(PROD_RESS) @@ -275,7 +275,7 @@ DBDFLAGS = $(USR_DBDFLAGS) -I . -I .. $(INSTALL_DBDFLAGS) # ar definition default AR = $($(ANSI)_AR) ARFLAGS = -ARCMD = $(AR) $(ARFLAGS) $@ +ARCMD = $(AR) $(ARFLAGS) $@ $(LIBRARY_LD_OBJS) #-------------------------------------------------- # C compiler @@ -295,7 +295,10 @@ COMPILE.cpp = $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(INCLUDES) -c $(SOURCE_CXXFLAG) #-------------------------------------------------- # depends definition -DEPENDS_RULE = -$(COMPILE.cpp) $(DEPENDS_FLAG) $^ > DEPENDS +TARGET_SRCS = $(foreach name, $(TESTPROD) $(PROD) $(LIBRARY_HOST) $(LIBRARY_IOC), $($(name)_SRCS)) +SRC_FILES = $(foreach src, $(LIBSRCS) $(SRCS) $(PROD_SRCS) $(TARGET_SRCS) , \ + $(firstword $(wildcard $(addsuffix /$(src),$(ALL_SRC_DIRS))) $(src))) +DEPENDS_RULE = -$(COMPILE.cpp) $(DEPENDS_FLAG) $(SRC_FILES) > DEPENDS #--------------------------------------------------------------- # Names of installed items