summaryrefslogtreecommitdiff
path: root/TAO/TAO_IDL
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-11-05 19:39:04 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-11-05 19:39:04 +0000
commit06912d57418ed89e2ad4db2f31d140eaf18bc3ec (patch)
tree5e0cce6dab559237ddba7e4b77a2b7f540a0df35 /TAO/TAO_IDL
parent25639563f07363b0c4e17fb8263f7c0b5ebb330f (diff)
downloadATCD-06912d57418ed89e2ad4db2f31d140eaf18bc3ec.tar.gz
more hacks to not build on VxWorks
Diffstat (limited to 'TAO/TAO_IDL')
-rw-r--r--TAO/TAO_IDL/Makefile12
1 files changed, 8 insertions, 4 deletions
diff --git a/TAO/TAO_IDL/Makefile b/TAO/TAO_IDL/Makefile
index d8c9629c346..00407d028e6 100644
--- a/TAO/TAO_IDL/Makefile
+++ b/TAO/TAO_IDL/Makefile
@@ -14,7 +14,6 @@
include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
ifdef VXWORKS
all.nested: any
@@ -30,9 +29,10 @@ ifdef VXWORKS
any:
@echo The IDL compiler won\'t run or build for VxWorks.
else
- include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
- include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU
- include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
+ include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
+ include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
+ include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU
+ include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
endif # VXWORKS
INFO =
@@ -48,7 +48,11 @@ BUILD = $(VBIN)
#----------------------------------------------------------------------------
all:
+ifdef VXWORKS
+ @echo The IDL compiler won\'t run or build for VxWorks.
+else
$(PRELINK) $(CXX) $(CFLAGS) -o $(BIN) $(TAOLIBS) $(LIBS)
+endif # VXWORKS
tags:
rm -f TAGS