summaryrefslogtreecommitdiff
path: root/include/makeinclude/wrapper_macros.GNU
diff options
context:
space:
mode:
authorjoeh <joeh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-07-09 18:35:03 +0000
committerjoeh <joeh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-07-09 18:35:03 +0000
commit6816b4d7055be63eaa1e7fe28361b0cc5c44db5d (patch)
tree1d55df38e297e406e19d9e330e095dd281d94d71 /include/makeinclude/wrapper_macros.GNU
parent2bb1ad6f4485e221a914903001b4e619ee096ec3 (diff)
downloadATCD-6816b4d7055be63eaa1e7fe28361b0cc5c44db5d.tar.gz
ChangeLogTag: Mon Jul 9 13:33:43 2001 Joe Hoffert <joeh@cs.wustl.edu>
Diffstat (limited to 'include/makeinclude/wrapper_macros.GNU')
-rw-r--r--include/makeinclude/wrapper_macros.GNU12
1 files changed, 10 insertions, 2 deletions
diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU
index ff1ea24aaf2..10d1d55920a 100644
--- a/include/makeinclude/wrapper_macros.GNU
+++ b/include/makeinclude/wrapper_macros.GNU
@@ -175,6 +175,10 @@ xt_reactor = 0
#### flag to Include/Preclude the RAPI support in ACE
rapi = 0
+ifndef PACE_ROOT
+ PACE_ROOT = $(ACE_ROOT)/PACE
+endif # PACE_ROOT
+
include $(ACE_ROOT)/include/makeinclude/platform_macros.GNU
#----------------------------------------------------------------------------
@@ -507,9 +511,13 @@ ifneq ($(pace),)
ACELIB = -lACE
ifeq ($(inline),0)
ACELIB += -lPACE
- LDFLAGS += -L$(ACE_ROOT)/PACE/pace/
+ LDFLAGS += -L$(PACE_ROOT)/pace/
+ endif # inline == 0
+ ifdef VXWORKS
+ ACELIB += -lPACE
+ LDFLAGS += -L$(PACE_ROOT)/pace/
endif # inline == 0
- include $(ACE_ROOT)/PACE/include/makeinclude/rules.common.GNU
+ include $(PACE_ROOT)/include/makeinclude/rules.common.GNU
endif # pace
ifeq ($(profile),0)