diff options
Diffstat (limited to 'ACE/include/makeinclude/rules.lib.GNU')
| -rw-r--r-- | ACE/include/makeinclude/rules.lib.GNU | 57 |
1 files changed, 4 insertions, 53 deletions
diff --git a/ACE/include/makeinclude/rules.lib.GNU b/ACE/include/makeinclude/rules.lib.GNU index 82b423c4284..6b8c2e8fc13 100644 --- a/ACE/include/makeinclude/rules.lib.GNU +++ b/ACE/include/makeinclude/rules.lib.GNU @@ -137,7 +137,6 @@ ifneq ($(INSLIB),) endif # INSLIB ace_lib_prelink ?= 0 -aix_build ?= 0 ifeq (1,$(VXWORKS)) @@ -193,16 +192,6 @@ $(VLIB): $(VLOBJS) ([ "`echo $(TMPINCDIR:%=%/*.$(OBJEXT))`" != "$(TMPINCDIR:%=%/*.$(OBJEXT))" ] && echo $(TMPINCDIR:%=%/*.$(OBJEXT)); \ echo $(filter %.$(OBJEXT), $^)) | 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; \ - then \ - $(LINK.cc) $(LINK_OUTPUT_FLAG) dummy $(LDFLAGS) $(ACE_ROOT)/etc/xlc_dummy.cpp $^ $(ACE_SHLIBS) $(LIBS); \ - $(RM) dummy; \ - $(AR) $(ARFLAGS) $@ $(TEMPINCDIR)/*.$(OBJEXT); \ - fi - endif -chmod a+r $@ ifneq (,$(RANLIB)) -$(RANLIB) $@ @@ -210,55 +199,19 @@ $(VLIB): $(VLOBJS) endif # !VXWORKS -# Note that if you don't want to build shared libraries, just remove the -# $(VSHOBJS) -# -# The AIX shr.o build is out here to keep it away from the SOVERSION stuff. -# The SOVERSION transform is applied after building the library file. -ifeq (1,$(aix_build)) -shr.o: $(VSHOBJS) - $(SHR_FILTER) $(SOLINK.cc) $(SO_OUTPUT_FLAG) $@ $^ $(LDFLAGS) $(ACE_SHLIBS) $(LIBS) - -.INTERMEDIATE: shr.o -endif # aix_build - ifeq ($(VXWORKSLINK),1) $(VSHLIB): $(basename $(notdir $(PRJ_FILE))).out -$(RM) $@ -$(LN_S) $(PROJECT_OUT) $@ -$(POST_BUILD_RULE) else # !VXWORKSLINK - ifeq (1,$(aix_build)) -$(VSHLIB): shr.o - $(AR) $(ARFLAGS) $@ $? - ifneq (,$(RANLIB)) - -$(RANLIB) $@ - endif # RANLIB - else # ! aix_build $(VSHLIB): $(VSHOBJS) - ifdef PRELIB + ifdef PRELIB $(PRELIB) - endif # PRELIB - ifdef ibmcxx_build - # This is required to get AIX IBM C/C++ to instantiate and compile the needed - # templates before building the library. - if test -s ./$(TEMPINCDIR)/*.C; \ - then \ - $(LINK.cc) $(LINK_OUTPUT_FLAG) dummy $(LDFLAGS) $(ACE_ROOT)/etc/xlc_dummy.cpp $^ $(ACE_SHLIBS) $(LIBS); \ - $(RM) dummy; \ - fi - endif # ibmcxx_build - ifdef SHLIBBUILD + endif # PRELIB + ifdef SHLIBBUILD $(SHLIBBUILD) else # ! SHLIBBUILD - ifdef ibmcxx_build - if test -s ./$(TEMPINCDIR)/*.$(OBJEXT); \ - then \ - $(SOLINK.cc) $(SO_OUTPUT_FLAG) $@ $^ $(TEMPINCDIR)/*.$(OBJEXT) $(LDFLAGS) $(ACE_SHLIBS) $(LIBS); \ - else \ - $(SOLINK.cc) $(SO_OUTPUT_FLAG) $@ $^ $(LDFLAGS) $(ACE_SHLIBS) $(LIBS); \ - fi - else # !ibmcxx_build ifeq (1,$(ace_lib_prelink)) #### Attempt a link (which will fail), to add template instantiations #### to lib files, for example. @@ -269,9 +222,7 @@ $(VSHLIB): $(VSHOBJS) else $(SHR_FILTER) $(SOLINK.cc) $(SO_OUTPUT_FLAG) $@ $^ $(LDFLAGS) $(ACE_SHLIBS) $(LIBS) endif #override - endif # ibmcxx_build - endif # SHLIBBUILD - endif # aix_build + endif # SHLIBBUILD endif # VXWORKSLINK ifneq ($(SOVERSION),) # This carefully works with both ARCH (where VSHLIB_* refer to the ARCH |