summaryrefslogtreecommitdiff
path: root/include/makeinclude/rules.lib.GNU
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>1999-06-25 19:59:15 +0000
committerSteve Huston <shuston@riverace.com>1999-06-25 19:59:15 +0000
commit71a181b072aa1a868b50b40a4e2927aa08c17250 (patch)
treeaf24734ef32fe5d76e5b157c8146a359f1989f69 /include/makeinclude/rules.lib.GNU
parenta2817a455bd442810d50b5247b645934dc4d4e53 (diff)
downloadATCD-71a181b072aa1a868b50b40a4e2927aa08c17250.tar.gz
Determine at makeC++SharedLib time if tempin/*.o needs to be included
in the input files.
Diffstat (limited to 'include/makeinclude/rules.lib.GNU')
-rw-r--r--include/makeinclude/rules.lib.GNU11
1 files changed, 10 insertions, 1 deletions
diff --git a/include/makeinclude/rules.lib.GNU b/include/makeinclude/rules.lib.GNU
index 4af15f05119..756b6efaf48 100644
--- a/include/makeinclude/rules.lib.GNU
+++ b/include/makeinclude/rules.lib.GNU
@@ -124,7 +124,16 @@ endif
ifdef SHLIBBUILD
$(SHLIBBUILD)
else
- $(SOLINK.cc) -o $@ $(VSHOBJS1) $(TMPL_OBJS) $(LDFLAGS) $(LIBS)
+ifdef TEMPINCDIR
+ if test -s ./$(TEMPINCDIR)/*.o; \
+ then \
+ $(SOLINK.cc) -o $@ $(VSHOBJS1) $(TEMPINCDIR)/*.o $(LDFLAGS) $(LIBS); \
+ else \
+ $(SOLINK.cc) -o $@ $(VSHOBJS1) $(LDFLAGS) $(LIBS); \
+ fi
+else
+ $(SOLINK.cc) -o $@ $(VSHOBJS1) $(LDFLAGS) $(LIBS)
+endif
-chmod a+rx $@
endif