summaryrefslogtreecommitdiff
path: root/ACE/include/makeinclude/rules.bin.GNU
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2008-11-14 22:29:43 +0000
committerSteve Huston <shuston@riverace.com>2008-11-14 22:29:43 +0000
commita120af7a988f81e051d803ba040f9ff559c367e8 (patch)
tree35eb846c984a1bd89820252ac85c55cf47a6ac65 /ACE/include/makeinclude/rules.bin.GNU
parent64e162367e75a8026a6f3f4ae939b8c05bfa410d (diff)
downloadATCD-a120af7a988f81e051d803ba040f9ff559c367e8.tar.gz
ChangeLogTag:Fri Nov 14 22:25:34 UTC 2008 Steve Huston <shuston@riverace.com>
Diffstat (limited to 'ACE/include/makeinclude/rules.bin.GNU')
-rw-r--r--ACE/include/makeinclude/rules.bin.GNU11
1 files changed, 6 insertions, 5 deletions
diff --git a/ACE/include/makeinclude/rules.bin.GNU b/ACE/include/makeinclude/rules.bin.GNU
index ab22f2e4975..fe6fb0a83b1 100644
--- a/ACE/include/makeinclude/rules.bin.GNU
+++ b/ACE/include/makeinclude/rules.bin.GNU
@@ -9,7 +9,7 @@
#----------------------------------------------------------------------------
ifdef BIN
- VBIN = $(BIN:%=%$(VAR))
+ VBIN = $(ARCH_BIN:%=%$(VAR))
# VBIN always depends on idl_stubs and libraries, if they exist.
ifdef IDL_SRC
$(VBIN): $(IDL_SRC)
@@ -39,14 +39,15 @@ VXWORKSLINK ?=
using_aix_vacpp ?=
ifeq ($(VXWORKSLINK),1)
-$(BIN): $(DEFAULTRULE)
+$(ARCH_BIN): $(DEFAULTRULE)
mv $(DEFAULTRULE) $@
else # !VXWORKSLINK
ifeq (1,$(using_aix_vacpp))
-$(BIN): %: %.icc $(SRC)
+$(ARCH_BIN): %: %.icc $(SRC)
vacbld_r $< -severitylevel=warning
else # !using_aix_vacpp
-$(BIN): %: $(VDIR)%.$(OBJEXT) $(VOBJS)
- $(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $@ $(sort $(VDIR)$@.$(OBJEXT) $(VOBJS)) $(VLDLIBS) $(POSTLINK)
+# Since we add in the vdir, don't use arch_bin. use bin instead!
+$(ARCH_BIN): %: $(VDIR)$(BIN).$(OBJEXT) $(VOBJS)
+ $(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $@ $(sort $(VDIR)$(BIN).$(OBJEXT) $(VOBJS)) $(VLDLIBS) $(POSTLINK)
endif # using_aix_vacpp
endif