ChangeLogTag:Mon Feb 21 14:35:39 2000 Christopher Kohlhoff <chris@kohlhoff.com>

2 files changed, 86 insertions, 4 deletions

diff --git a/include/makeinclude/compiler.bor b/include/makeinclude/compiler.bor
index 37721233145..51b2357fecb 100644
--- a/include/makeinclude/compiler.bor
+++ b/include/makeinclude/compiler.bor
@@ -101,26 +101,35 @@ EXE_STARTUP_OBJ = c0x32.obj
 
 LIB_CFLAGS =
 !ifdef DEBUG
-LIB_LFLAGS = /C /P2048
+LIB_LFLAGS = /C /P4096
 !else
 LIB_LFLAGS = /C /P512
 !endif
 
 #
+# VCL lib version number
+#
+
+!if $(BCBVER) == 5
+VCLVER = 50
+!else
+VCLVER = 40
+!endif
+
+#
 # Libraries to be linked
 #
 
 !ifdef STATIC
 !ifdef PASCAL
-COMMON_LIBS = import32.lib vcl.lib vcl40.lib cp32mt.lib ws2_32.lib
+COMMON_LIBS = import32.lib vcl$(VCLVER).lib vcle$(VCLVER).lib cp32mt.lib ws2_32.lib
 !else
 COMMON_LIBS = import32.lib cw32mt.lib ws2_32.lib
 !endif
 !else
 !ifdef PASCAL
-COMMON_LIBS = import32.lib vcl.lib vcl40.bpi cp32mti.lib ws2_32.lib
+COMMON_LIBS = import32.lib vcl$(VCLVER).bpi vcle$(VCLVER).lib cp32mti.lib ws2_32.lib
 !else
 COMMON_LIBS = import32.lib cw32mti.lib ws2_32.lib
 !endif
 !endif
-
diff --git a/include/makeinclude/recurse.bor b/include/makeinclude/recurse.bor
new file mode 100644
index 00000000000..77c878e6ab7
--- /dev/null
+++ b/include/makeinclude/recurse.bor
@@ -0,0 +1,73 @@
+#
+# Macros for recursive invocations of make
+#
+# Inputs: 
+# ~~~~~~~ 
+# DIRS - list of sub-directories to invoke make in
+# MAKEFILES - list of makefiles to be run
+#
+
+!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
+
+!ifdef DIRS
+
+all: $(DIRS)
+
+# We use an extra level of make recursion to ensure the current directory is
+# automatically restored when the sub-directory is finished.
+$(DIRS):
+	@echo Entering directory $<
+	@$(MAKE) $(MAKE_FLAGS) -f&&!
+all:
+	@cd $<
+	$(MAKE) $(MAKE_FLAGS) -fMakefile.bor
+!
+
+# This ugliness is to remove extra spaces from between the items in the list.
+DIRS_CLEAN_1 = $(DIRS) $(BLANK_SPACE)
+DIRS_CLEAN_2 = $(DIRS_CLEAN_1: =%)
+DIRS_CLEAN_3 = $(DIRS_CLEAN_2:%%=%)
+DIRS_CLEAN_4 = $(DIRS_CLEAN_3:%%=%)
+DIRS_CLEAN = $(DIRS_CLEAN_4:%=.Clean )
+
+clean: $(DIRS_CLEAN)
+
+# We use an extra level of make recursion to ensure the current directory is
+# automatically restored when the sub-directory is finished.
+$(DIRS_CLEAN):
+	@echo Cleaning directory $(<:.Clean=)
+	@$(MAKE) $(MAKE_FLAGS) -f&&!
+all:
+	@cd $(<:.Clean=)
+	$(MAKE) $(MAKE_FLAGS) -fMakefile.bor clean
+!
+
+!endif
+
+!ifdef MAKEFILES
+
+# This ugliness is to remove extra spaces from between the items in the list.
+MAKEFILES_ALL_1 = $(MAKEFILES) $(BLANK_SPACE)
+MAKEFILES_ALL_2 = $(MAKEFILES_ALL_1: =%)
+MAKEFILES_ALL_3 = $(MAKEFILES_ALL_2:%%=%)
+MAKEFILES_ALL_4 = $(MAKEFILES_ALL_3:%%=%)
+MAKEFILES_ALL = $(MAKEFILES_ALL_4:%=.All )
+
+all: $(MAKEFILES_ALL)
+
+$(MAKEFILES_ALL):
+	$(MAKE) $(MAKE_FLAGS) -f$(<:.All=)
+
+# This ugliness is to remove extra spaces from between the items in the list.
+MAKEFILES_CLEAN_1 = $(MAKEFILES) $(BLANK_SPACE)
+MAKEFILES_CLEAN_2 = $(MAKEFILES_CLEAN_1: =%)
+MAKEFILES_CLEAN_3 = $(MAKEFILES_CLEAN_2:%%=%)
+MAKEFILES_CLEAN_4 = $(MAKEFILES_CLEAN_3:%%=%)
+MAKEFILES_CLEAN = $(MAKEFILES_CLEAN_4:%=.Clean )
+
+clean: $(MAKEFILES_CLEAN)
+
+$(MAKEFILES_CLEAN):
+	$(MAKE) $(MAKE_FLAGS) -f$(<:.Clean=) clean
+
+!endif