diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-08-05 21:35:52 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-08-05 21:35:52 +0000 |
| commit | 2142e0aa0dcc50c528ae25db2492dfc67d7e96bf (patch) | |
| tree | f65e34391a64513b7923cb6f31ec9f4ec12d36ee /include/makeinclude | |
| parent | d49256ee3ba15d21f510323b5c92f9717f6a4544 (diff) | |
| download | ATCD-2142e0aa0dcc50c528ae25db2492dfc67d7e96bf.tar.gz | |
ChangeLogTag:Thu Aug 5 16:27:15 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
Diffstat (limited to 'include/makeinclude')
| -rw-r--r-- | include/makeinclude/rules.lib.GNU | 10 | ||||
| -rw-r--r-- | include/makeinclude/wrapper_macros.GNU | 1 |
2 files changed, 6 insertions, 5 deletions
diff --git a/include/makeinclude/rules.lib.GNU b/include/makeinclude/rules.lib.GNU index 756b6efaf48..a5b6677aa03 100644 --- a/include/makeinclude/rules.lib.GNU +++ b/include/makeinclude/rules.lib.GNU @@ -93,7 +93,7 @@ ifdef TEMPINCDIR # templates. if test -s ./$(TEMPINCDIR)/*.C; \ then \ - $(LINK.cc) -o dummy $(LDFLAGS) $(ACE_ROOT)/etc/xlc_dummy.cpp $^ $(LIBS); \ + $(LINK.cc) -o dummy $(LDFLAGS) $(ACE_ROOT)/etc/xlc_dummy.cpp $^ $(ACE_SHLIBS) $(LIBS); \ $(RM) dummy; \ $(AR) $(ARFLAGS) $@ tempinc/*.o; \ fi @@ -117,7 +117,7 @@ ifdef TEMPINCDIR # templates before building the library. if test -s ./$(TEMPINCDIR)/*.C; \ then \ - $(LINK.cc) -o dummy $(LDFLAGS) $(ACE_ROOT)/etc/xlc_dummy.cpp $^ $(LIBS); \ + $(LINK.cc) -o dummy $(LDFLAGS) $(ACE_ROOT)/etc/xlc_dummy.cpp $^ $(ACE_SHLIBS) $(LIBS); \ $(RM) dummy; \ fi endif @@ -127,12 +127,12 @@ else ifdef TEMPINCDIR if test -s ./$(TEMPINCDIR)/*.o; \ then \ - $(SOLINK.cc) -o $@ $(VSHOBJS1) $(TEMPINCDIR)/*.o $(LDFLAGS) $(LIBS); \ + $(SOLINK.cc) -o $@ $(VSHOBJS1) $(TEMPINCDIR)/*.o $(LDFLAGS) $(ACE_SHLIBS) $(LIBS); \ else \ - $(SOLINK.cc) -o $@ $(VSHOBJS1) $(LDFLAGS) $(LIBS); \ + $(SOLINK.cc) -o $@ $(VSHOBJS1) $(LDFLAGS) $(ACE_SHLIBS) $(LIBS); \ fi else - $(SOLINK.cc) -o $@ $(VSHOBJS1) $(LDFLAGS) $(LIBS) + $(SOLINK.cc) -o $@ $(VSHOBJS1) $(LDFLAGS) $(ACE_SHLIBS) $(LIBS) endif -chmod a+rx $@ endif diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU index 56d256d90b8..c68c16db5ec 100644 --- a/include/makeinclude/wrapper_macros.GNU +++ b/include/makeinclude/wrapper_macros.GNU @@ -390,6 +390,7 @@ ifdef shared_libs ifdef SHLIBA LDLIBS := $(LDLIBS:-l%=-l%shr) + ACE_SHLIBS := $(ACE_SHLIBS:-l%=-l%shr) endif # SHLIBA else # ! shared_libs ifdef static_libs |