diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2004-11-08 18:05:55 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2004-11-08 18:05:55 +0000 |
| commit | 171490489c95bd6d6191b4830891916316de152f (patch) | |
| tree | b8b91c3d7c6aedab9dbfcef668f6226c4bdb9a25 | |
| parent | f163cff6296178e8f7ddd9668ec8f058240e5080 (diff) | |
| download | ATCD-171490489c95bd6d6191b4830891916316de152f.tar.gz | |
ChangeLogTag: Mon Nov 8 12:05:03 2004 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | include/makeinclude/rules.lib.GNU | 7 |
2 files changed, 9 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 9275341f879..788b2265c56 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Mon Nov 8 12:05:03 2004 Chad Elliott <elliott_c@ociweb.com> + + * include/makeinclude/rules.lib.GNU: + + Removed the unnecessary semi-colon from the end of the ar command + line and collapsed the special rule for vxworks_ntbuild as it was + no longer needed. + Mon Nov 8 11:34:34 2004 Chad Elliott <elliott_c@ociweb.com> * bin/DependencyGenerator/DependencyEditor.pm: diff --git a/include/makeinclude/rules.lib.GNU b/include/makeinclude/rules.lib.GNU index 54e90e6055c..a8ef79f0027 100644 --- a/include/makeinclude/rules.lib.GNU +++ b/include/makeinclude/rules.lib.GNU @@ -108,7 +108,6 @@ endif # shared_libs ace_lib_prelink ?= 0 aix_build ?= 0 -vxworks_ntbuild ?= 0 $(VLIB): $(VLOBJS) @@ -131,15 +130,11 @@ 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 -ifeq (1,$(vxworks_ntbuild)) echo $(TMPINCDIR:%=%/*.o) $(filter %.o, $?) | xargs $(AR) $(ARFLAGS) $@ $(AREXTRA) -else - echo $(TMPINCDIR:%=%/*.o) $(filter %.o, $?) | xargs $(AR) $(ARFLAGS) $@ $(AREXTRA); -endif ifdef ibmcxx_build # This is required to get AIX IBM C/C++ to instantiate and compile the needed # templates. - if test -s ./$(TEMPINCDIR)/*.C; \ + if test -s ./$(TEMPINCDIR)/*.C; \ then \ $(LINK.cc) $(LINK_OUTPUT_FLAG) dummy $(LDFLAGS) $(ACE_ROOT)/etc/xlc_dummy.cpp $^ $(ACE_SHLIBS) $(LIBS); \ $(RM) dummy; \ |