diff options
| author | Steve Huston <shuston@riverace.com> | 1999-06-25 19:59:15 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 1999-06-25 19:59:15 +0000 |
| commit | 3714c8f717578a005b1576e352bbcb66b6b6cbbd (patch) | |
| tree | af24734ef32fe5d76e5b157c8146a359f1989f69 /include | |
| parent | 90140c0f97da5b5f4c8a0b2d43b51ca6751fa53a (diff) | |
| download | ATCD-3714c8f717578a005b1576e352bbcb66b6b6cbbd.tar.gz | |
Determine at makeC++SharedLib time if tempin/*.o needs to be included
in the input files.
Diffstat (limited to 'include')
| -rw-r--r-- | include/makeinclude/platform_aix4_cset++.GNU | 1 | ||||
| -rw-r--r-- | include/makeinclude/rules.lib.GNU | 11 |
2 files changed, 10 insertions, 2 deletions
diff --git a/include/makeinclude/platform_aix4_cset++.GNU b/include/makeinclude/platform_aix4_cset++.GNU index 30ae0b98208..ae31b487da6 100644 --- a/include/makeinclude/platform_aix4_cset++.GNU +++ b/include/makeinclude/platform_aix4_cset++.GNU @@ -72,5 +72,4 @@ OCCFLAGS += -qarch=com RANLIB = ranlib SOFLAGS = -p 0 TEMPINCDIR = tempinc -TMPL_OBJS := $(TEMPINCDIR)/*.o SOBUILD = 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 |