diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2004-01-05 18:22:14 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2004-01-05 18:22:14 +0000 |
| commit | 077ae9674d5f937147e870d17f5afe41f6b3b4ce (patch) | |
| tree | 6ecab9aca39b43e7d4224ae3915626c2399902da | |
| parent | 580f950a463277328bb074784549e6d255e5458a (diff) | |
| download | ATCD-077ae9674d5f937147e870d17f5afe41f6b3b4ce.tar.gz | |
ChangeLogTag:Mon Jan 5 12:30:56 2004 Don Hinton <dhinton@ieee.org>
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | include/makeinclude/rules.lib.GNU | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 4bb9e95400a..346bc373596 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Mon Jan 5 12:30:56 2004 Don Hinton <dhinton@ieee.org> + + * include/makeinclude/rules.lib.GNU: + + Fixed a bug report that caused the generated cpp files to be + added to the archive. Thanks to Werner Buchart <w.buchert@medat.de> + for reporting the problem. + Mon Jan 5 10:47:51 2004 Chad Elliott <elliott_c@ociweb.com> * bin/MakeProjectCreator/templates/cbx.mpd: diff --git a/include/makeinclude/rules.lib.GNU b/include/makeinclude/rules.lib.GNU index bc398003d14..fdf6bcce485 100644 --- a/include/makeinclude/rules.lib.GNU +++ b/include/makeinclude/rules.lib.GNU @@ -130,7 +130,7 @@ ifeq (1,$(ace_lib_prelink)) #### to lib files, for example. -$(LINK.cc) $(LINK_OUTPUT_FLAG) ace-templ_inst $? $(LDFLAGS) $(ACE_NUL_STDERR) endif # ace_lib_prelink - echo $(TMPINCDIR:%=%/*.o) $? | xargs $(AR) $(ARFLAGS) $@ $(AREXTRA); + echo $(TMPINCDIR:%=%/*.o) $(filter %.o, $?) | xargs $(AR) $(ARFLAGS) $@ $(AREXTRA); ifdef ibmcxx_build # This is required to get AIX IBM C/C++ to instantiate and compile the needed # templates. |