diff options
Diffstat (limited to 'include/makeinclude/rules.lib.GNU')
| -rw-r--r-- | include/makeinclude/rules.lib.GNU | 35 |
1 files changed, 10 insertions, 25 deletions
diff --git a/include/makeinclude/rules.lib.GNU b/include/makeinclude/rules.lib.GNU index 4af15f05119..14b8ea5e2e2 100644 --- a/include/makeinclude/rules.lib.GNU +++ b/include/makeinclude/rules.lib.GNU @@ -19,13 +19,12 @@ ifndef SOEXT endif VSHLIB = $(SHLIB:%.$(SOEXT)=%$(VAR).$(SOEXT)) -ifdef SHLIBA -VSHLIBA = $(SHLIBA:%.a=%$(VAR).a) -endif - VLOBJS = $(subst .cpp,.$(OBJEXT),$(foreach file,$(LSRC),$(VDIR)$(notdir $(file)))) -LSRC += $(LSRC2) +ifdef TEMPINCDIR + VSHOBJS1 = +else # ! TEMPINCDIR + LSRC += $(LSRC2) ifdef PRELIB ifdef PRELIB_USES_OBJ_ONLY VSHOBJS = $(subst .cpp,.o,$(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file)))) @@ -38,6 +37,7 @@ else # ! PRELIB VSHOBJS1 = \ $(subst .cpp,.o,$(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file)))) endif # ! PRELIB +endif # ! TEMPINCDIR # Comment out for now... # $(DEFS:%=$(INSINC)/%) \ @@ -45,18 +45,12 @@ endif # ! PRELIB ifdef shared_libs_only INSTALL += \ $(VSHLIB:%.$(SOEXT)=$(INSLIB)/%.$(SOEXT)$(ACE_LDSO_Version_Number)) -ifdef SHLIBA - INSTALL += $(VSHLIBA:%=$(INSLIB)/%) -endif else ifdef static_libs_only INSTALL += $(VLIB:%.a=$(INSLIB)/%.a) else INSTALL += $(VLIB:%.a=$(INSLIB)/%.a) \ $(VSHLIB:%.$(SOEXT)=$(INSLIB)/%.$(SOEXT)$(ACE_LDSO_Version_Number)) -ifdef SHLIBA - INSTALL += $(VSHLIBA:%=$(INSLIB)/%) -endif endif # static_libs_only endif # shared_libs_only @@ -74,7 +68,7 @@ ifdef PRELIB endif # Comment these lines out if you want to build both *.a and *.so libraries... -#$(VSHLIB): $(VSHOBJS) +#$(VSHLIB): $(VSHOBJS) $(STATLIB) #ifdef PRELIB # $(PRELIB) #endif @@ -93,7 +87,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 $@ $(LIBS); \ $(RM) dummy; \ $(AR) $(ARFLAGS) $@ tempinc/*.o; \ fi @@ -105,26 +99,17 @@ endif # RANLIB # Note that if you don't want to build shared libraries, just remove the $(VSHOBJS) ifdef SHLIBBUILD -$(VSHLIB): $(VSHOBJS) +$(VSHLIB): $(VSHOBJS) $(STATLIB) else -$(VSHLIB): $(VSHOBJS1) +$(VSHLIB): $(VSHOBJS1) $(STATLIB) endif ifdef PRELIB $(PRELIB) endif -ifdef TEMPINCDIR -# This is required to get AIX xlC to instantiate and compile the needed -# templates before building the library. - if test -s ./$(TEMPINCDIR)/*.C; \ - then \ - $(LINK.cc) -o dummy $(LDFLAGS) $(ACE_ROOT)/etc/xlc_dummy.cpp $^ $(LIBS); \ - $(RM) dummy; \ - fi -endif ifdef SHLIBBUILD $(SHLIBBUILD) else - $(SOLINK.cc) -o $@ $(VSHOBJS1) $(TMPL_OBJS) $(LDFLAGS) $(LIBS) + $(SOLINK.cc) -o $@ $(VSHOBJS1) $(LDFLAGS) $(LIBS) $(STATLIB) -chmod a+rx $@ endif |