epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Added LDOBJS for linking with R3.13 *Lib object files without trailing .o.

Browse Source
This commit is contained in:
Janet B. Anderson
2002-02-18 21:07:03 +00:00
parent 9126e5dd9a
commit 654ca82fbf
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
configure/CONFIG_ADDONS
View File

@@ -162,11 +162,11 @@ OBJS_HOST+=$(OBJS_HOST_DEFAULT)
endif
endif
ifneq ($(strip $(LIBOBJS_$(OS_CLASS))),)
LIBOBJS+=$(subst -nil-,,$(LIBOBJS_$(OS_CLASS)))
ifneq ($(strip $(LDOBJS_$(OS_CLASS))),)
LDOBJS+=$(subst -nil-,,$(LDOBJS_$(OS_CLASS)))
else
ifneq (,$(strip $(LIBOBJS_DEFAULT)))
LIBOBJS+=$(LIBOBJS_DEFAULT)
ifneq (,$(strip $(LDOBJS_DEFAULT)))
LDOBJS+=$(LDOBJS_DEFAULT)
endif
endif

6
configure/CONFIG_COMMON
View File

@@ -115,13 +115,13 @@ JAR =
#--------------------------------------------------
# obj files
TARGET_OBJS = $(addsuffix $(OBJ),$(basename $($*_OBJS)))
TARGET_OBJS = $($*_LDOBJS) $(addsuffix $(OBJ),$(basename $($*_OBJS)))
PRODUCT_OBJS = $(addsuffix $(OBJ),$(basename $(SRCS) $(PROD_SRCS) $(PROD_OBJS)))
PROD_LD_OBJS = $(TARGET_OBJS) $(PRODUCT_OBJS)
PROD_LD_OBJS = $(LDOBJS) $(TARGET_OBJS) $(PRODUCT_OBJS)
LIBRARY_OBJS = $(addsuffix $(OBJ),$(basename $(SRCS) $(LIB_SRCS) $(LIBSRCS) $(LIB_OBJS)))
LIBRARY_LD_OBJS = $(TARGET_OBJS) $(LIBRARY_OBJS)
LIBRARY_LD_OBJS = $(LDOBJS) $(TARGET_OBJS) $(LIBRARY_OBJS)
#--------------------------------------------------
# WIN95/NT resource files

7
configure/tools/makeMakefileInclude.pl
View File

@@ -52,6 +52,13 @@ foreach $name ( @nameList ) {
print OUT "${name}_OBJS+=\$(${name}_OBJS_DEFAULT)\n";
print OUT "endif\n";
print OUT "endif\n";
print OUT "ifneq (\$(strip \$(${name}_LDOBJS_\$(OS_CLASS))),)\n";
print OUT "${name}_LDOBJS+=\$(subst -nil-,,\$(${name}_LDOBJS_\$(OS_CLASS)))\n";
print OUT "else\n";
print OUT "ifdef ${name}_LDOBJS_DEFAULT\n";
print OUT "${name}_LDOBJS+=\$(${name}_LDOBJS_DEFAULT)\n";
print OUT "endif\n";
print OUT "endif\n";
print OUT "ifneq (\$(strip \$(${name}_LIBS_\$(OS_CLASS))),)\n";
print OUT "${name}_LDLIBS+=\$(subst -nil-,,\$(${name}_LIBS_\$(OS_CLASS)))\n";
print OUT "else\n";