summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvenkita <venkita@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-12-19 16:04:46 +0000
committervenkita <venkita@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-12-19 16:04:46 +0000
commit884a63df47e1ecc0c617bfea446a7c56b666ac24 (patch)
treed21bec7aa0c07e489e4cda0407a624d5ef0ac635
parent2ad2076f4cec25b1c36882630a9f78ccebbd6d35 (diff)
downloadATCD-884a63df47e1ecc0c617bfea446a7c56b666ac24.tar.gz
ChangeLogTag: Wed Dec 19 10:02:53 2001 Venkita Subramonian <venkita@cs.wustl.edu>
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLogs/ChangeLog-02a6
-rw-r--r--ChangeLogs/ChangeLog-03a6
-rw-r--r--Makefile.bor43
4 files changed, 27 insertions, 34 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a396438209..f4685a20c54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Dec 19 10:02:53 2001 Venkita Subramonian <venkita@cs.wustl.edu>
+
+ * Makefile.bor:
+ Made changes for Borland ace-only builds as per
+ Johnny Willemsen <johnny.willemsen@meco.nl>.
+
Wed Dec 19 09:39:03 2001 Venkita Subramonian <venkita@cs.wustl.edu>
* tests/Message_Queue_Test_Ex.cpp:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 3a396438209..f4685a20c54 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,9 @@
+Wed Dec 19 10:02:53 2001 Venkita Subramonian <venkita@cs.wustl.edu>
+
+ * Makefile.bor:
+ Made changes for Borland ace-only builds as per
+ Johnny Willemsen <johnny.willemsen@meco.nl>.
+
Wed Dec 19 09:39:03 2001 Venkita Subramonian <venkita@cs.wustl.edu>
* tests/Message_Queue_Test_Ex.cpp:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 3a396438209..f4685a20c54 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,9 @@
+Wed Dec 19 10:02:53 2001 Venkita Subramonian <venkita@cs.wustl.edu>
+
+ * Makefile.bor:
+ Made changes for Borland ace-only builds as per
+ Johnny Willemsen <johnny.willemsen@meco.nl>.
+
Wed Dec 19 09:39:03 2001 Venkita Subramonian <venkita@cs.wustl.edu>
* tests/Message_Queue_Test_Ex.cpp:
diff --git a/Makefile.bor b/Makefile.bor
index c2d5e22b4b4..14b6be9ad76 100644
--- a/Makefile.bor
+++ b/Makefile.bor
@@ -1,36 +1,11 @@
-!ifdef DEBUG
-DEBUG_FLAG = -DDEBUG
-!endif
+#
+# Makefile for building ACE
+#
-!ifdef STATIC
-STATIC_FLAG = -DSTATIC
-!endif
+DIRS = \
+ ace \
+ netsvcs \
+ tests \
+ apps
-!ifdef PASCAL
-PASCAL_FLAG = -DPASCAL
-!endif
-
-FLAGS = $(DEBUG_FLAG) $(STATIC_FLAG) $(PASCAL_FLAG)
-
-all:
- cd $(ACE_ROOT)\ace
- $(MAKE) -f Makefile.bor $(FLAGS)
- cd $(ACE_ROOT)\netsvcs
- $(MAKE) -f Makefile.bor $(FLAGS)
- cd $(ACE_ROOT)\tests
- $(MAKE) -f Makefile.bor $(FLAGS)
- cd $(ACE_ROOT)\apps
- $(MAKE) -f Makefile.bor $(FLAGS)
- cd $(ACE_ROOT)\TAO
- $(MAKE) -f Makefile.bor $(FLAGS)
-
-
-ace_only:
- cd $(ACE_ROOT)\ace
- $(MAKE) -f Makefile.bor $(FLAGS)
- cd $(ACE_ROOT)\netsvcs
- $(MAKE) -f Makefile.bor $(FLAGS)
- cd $(ACE_ROOT)\tests
- $(MAKE) -f Makefile.bor $(FLAGS)
- cd $(ACE_ROOT)\apps
- $(MAKE) -f Makefile.bor $(FLAGS)
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>