summaryrefslogtreecommitdiff
path: root/ACE/include/makeinclude/rules.lib.GNU
diff options
context:
space:
mode:
authorErik Sohns <erik.sohns@posteo.de>2023-04-05 17:37:54 +0200
committerErik Sohns <erik.sohns@posteo.de>2023-04-05 17:37:54 +0200
commit761e24b54d7fda41ed58a6e2f41ba905e43bf3d9 (patch)
tree69171a8ba215e125cf273ab6bbe4641313df6e6a /ACE/include/makeinclude/rules.lib.GNU
parent3e44fb91cf724aeb48b38169482a4878de316afc (diff)
parent9e18d338ec598e1a8da6d32a0fba5a20c76978f7 (diff)
downloadATCD-761e24b54d7fda41ed58a6e2f41ba905e43bf3d9.tar.gz
Merge branch 'message_queue_ex_get_queue' of https://github.com/esohns/ACE_TAO into message_queue_ex_get_queue
Diffstat (limited to 'ACE/include/makeinclude/rules.lib.GNU')
-rw-r--r--ACE/include/makeinclude/rules.lib.GNU63
1 files changed, 5 insertions, 58 deletions
diff --git a/ACE/include/makeinclude/rules.lib.GNU b/ACE/include/makeinclude/rules.lib.GNU
index 1a84f3d92cd..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))
@@ -187,25 +186,11 @@ $(VLIB): $(VLOBJS)
#### to lib files, for example.
-$(LINK.cc) $(LINK_OUTPUT_FLAG) ace-templ_inst $? $(LDFLAGS) $(ACE_NUL_STDERR)
endif # ace_lib_prelink
- ifeq (1,$(ACE_OPENVMS))
- find $(TMPINCDIR:%=%) -name "*.$(OBJEXT)" -or -name "*.obj" | xargs $(AR) $(ARFLAGS) $@ $(AREXTRA)
- else
- ifneq (,$(AR.cc.override))
+ ifneq (,$(AR.cc.override))
$(AR.cc.override)
else
([ "`echo $(TMPINCDIR:%=%/*.$(OBJEXT))`" != "$(TMPINCDIR:%=%/*.$(OBJEXT))" ] && echo $(TMPINCDIR:%=%/*.$(OBJEXT)); \
echo $(filter %.$(OBJEXT), $^)) | xargs $(AR) $(ARFLAGS) $@ $(AREXTRA)
- endif
- 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))
@@ -214,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.
@@ -273,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