Mercurial Mercurial > hg > stx-libjava / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
examples/tomcat6/bc.mak
branchdevelopment
changeset 2711 a00302fe5083
parent 2710 78c4f4a03914
child 2731 13f5be2bf83b 
--- a/examples/tomcat6/bc.mak	Thu Sep 05 22:08:59 2013 +0100
+++ b/examples/tomcat6/bc.mak	Fri Sep 06 00:16:38 2013 +0100
@@ -1,21 +1,31 @@
-# $Header: /cvs/stx/stx/libjava/examples/tomcat6/bc.mak,v 1.3 2013-05-28 10:33:00 cg Exp $
+# $Header$
 #
-# DO NOT EDIT
+# DO NOT EDIT 
 # automagically generated from the projectDefinition: stx_libjava_examples_tomcat6.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
 #
 # Historic Note:
-#  this used to contain only rules to make with borland
+#  this used to contain only rules to make with borland 
 #    (called via bmake, by "make.exe -f bc.mak")
 #  this has changed; it is now also possible to build using microsoft visual c
 #    (called via vcmake, by "make.exe -f bc.mak -DUSEVC")
 #
 
-TOP=..\..\..
+TOP=..\..\..       
 INCLUDE_TOP=$(TOP)\..
 
+# An old file, used as a dummy target for FORCE if we do not want
+#   re-make libraries. Windows make does not work if we redefine FORCE=   (empty string)
+# OLD_FILE=bmake.bat
+OLD_FILE="c:\windows\win.ini"
+
+#dummy target to force a build
+!ifndef FORCE
+FORCE=$(OLD_FILE)
+!endif
+
 CFLAGS_LOCAL=$(CFLAGS_APPTYPE) \
  -DSTARTUP_CLASS="\"ApacheTomcat6\"" \
  -DSTARTUP_SELECTOR="\"start\"" \
@@ -33,7 +43,7 @@
 #
 LIBNAME=dummy
 STCOPT="+optinline"
-LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libview2 -I$(INCLUDE_TOP)\stx\libjava -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\libcomp
+LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libbasic
 LOCALDEFINES=
 GLOBALDEFINES=
 
@@ -58,34 +68,33 @@
 
 REQUIRED_LIBS=librun.dll  \
  libstx_libbasic.dll \
+ libstx_libbasic2.dll \
  libstx_libcomp.dll \
- libstx_libbasic2.dll \
- libstx_libdb.dll \
+ libstx_libbasic3.dll \
  libstx_libview.dll \
- libstx_libdb_libsqlite.dll \
- libstx_libdb_libodbc.dll \
- libstx_libboss.dll \
+ libstx_libui.dll \
  libstx_libview2.dll \
- libstx_libbasic3.dll \
  libstx_goodies_sunit.dll \
- libstx_libui.dll \
  libstx_libwidg.dll \
+ libstx_libhtml.dll \
  libstx_libwidg2.dll \
- libstx_libhtml.dll \
  libstx_libtool.dll \
  libstx_libjava.dll \
 
 
-REQUIRED_FILES=cs3245.dll X11.dll Xext.dll symbols.stc $(REQUIRED_LIBS)
+REQUIRED_FILES=$(RT_DLL) $(X11_DLL) $(XEXT_DLL) symbols.stc $(REQUIRED_LIBS)
 
 REQUIRED_SUPPORT_DIRS=RESOURCEFILES
 
-target: ALL postBuildCleanup
+target: ALL postBuildCleanup 
 
 # the executable, all required files and a self-installing-installer-exe
-ALL:: prereq exe $(REQUIRED_SUPPORT_DIRS) ant postBuildCleanup setup
+ALL:: prereq ALL_NP
 
-exe:  newBuildDate  consoleApp
+# all, but no prereqs
+ALL_NP:: exe $(REQUIRED_SUPPORT_DIRS) postBuildCleanup setup
+
+exe:  newBuildDate $(REQUIRED_LIBS) noConsoleApp consoleApp
 
 # the executable only
 # with console
@@ -109,28 +118,14 @@
 		CRT_STARTUP=" $(CRT_STARTUP_NOCONSOLE)" theExe
 
 # the executable only (internal target; needs some defines)
-theExe: $(OUTDIR) $(OBJS) $(REQUIRED_FILES) show $(PROJECT)
+theExe: $(OUTDIR) $(OBJS) $(REQUIRED_FILES) show $(PROJECT) 
 
-# build all prerequisite packages for this package
+# build all mandatory prerequisite packages (containing superclasses) for this package
 prereq:
-	pushd ..\..\..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\libdb & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\libdb\libsqlite & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\libdb\libodbc & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\libboss & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\goodies\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\libhtml & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\libtool & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\.. & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	$(MAKE) -N -f bc.mak $(USE_ARG) FORCE=FORCE_BUILD $(REQUIRED_LIBS)
 
+FORCE_BUILD:
+	@rem Dummy target to force a build
 
 # a nullsoft installable delivery
 # This uses the Nullsoft Installer Package and works in Windows only
@@ -219,7 +214,7 @@
 libtool2_RESOURCES: resources\stx\libtool2\NUL
 	-copy $(TOP)\libtool2\resources\*.rs resources\stx\libtool2\*.*
 
-libview_RESOURCES: resources\stx\libview\NUL
+libview_RESOURCES: resources\stx\libview\NUL 
 	-copy $(TOP)\libview\resources\*.rs resources\stx\libview\*.*
 
 libview2_RESOURCES: resources\stx\libview2\NUL
@@ -269,109 +264,85 @@
 libstx_libbasic.dll: ..\..\..\libbasic\$(OBJDIR)\libstx_libbasic.dll
 	copy ..\..\..\libbasic\$(OBJDIR)\libstx_libbasic.dll *.*
 
-..\..\..\libbasic\$(OBJDIR)\libstx_libbasic.dll:
+..\..\..\libbasic\$(OBJDIR)\libstx_libbasic.dll: $(FORCE)
 	pushd ..\..\..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 
+libstx_libbasic2.dll: ..\..\..\libbasic2\$(OBJDIR)\libstx_libbasic2.dll
+	copy ..\..\..\libbasic2\$(OBJDIR)\libstx_libbasic2.dll *.*
+
+..\..\..\libbasic2\$(OBJDIR)\libstx_libbasic2.dll: $(FORCE)
+	pushd ..\..\..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+
 libstx_libcomp.dll: ..\..\..\libcomp\$(OBJDIR)\libstx_libcomp.dll
 	copy ..\..\..\libcomp\$(OBJDIR)\libstx_libcomp.dll *.*
 
-..\..\..\libcomp\$(OBJDIR)\libstx_libcomp.dll:
+..\..\..\libcomp\$(OBJDIR)\libstx_libcomp.dll: $(FORCE)
 	pushd ..\..\..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 
-libstx_libbasic2.dll: ..\..\..\libbasic2\$(OBJDIR)\libstx_libbasic2.dll
-	copy ..\..\..\libbasic2\$(OBJDIR)\libstx_libbasic2.dll *.*
-
-..\..\..\libbasic2\$(OBJDIR)\libstx_libbasic2.dll:
-	pushd ..\..\..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+libstx_libbasic3.dll: ..\..\..\libbasic3\$(OBJDIR)\libstx_libbasic3.dll
+	copy ..\..\..\libbasic3\$(OBJDIR)\libstx_libbasic3.dll *.*
 
-libstx_libdb.dll: ..\..\..\libdb\$(OBJDIR)\libstx_libdb.dll
-	copy ..\..\..\libdb\$(OBJDIR)\libstx_libdb.dll *.*
-
-..\..\..\libdb\$(OBJDIR)\libstx_libdb.dll:
-	pushd ..\..\..\libdb & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+..\..\..\libbasic3\$(OBJDIR)\libstx_libbasic3.dll: $(FORCE)
+	pushd ..\..\..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 
 libstx_libview.dll: ..\..\..\libview\$(OBJDIR)\libstx_libview.dll
 	copy ..\..\..\libview\$(OBJDIR)\libstx_libview.dll *.*
 
-..\..\..\libview\$(OBJDIR)\libstx_libview.dll:
+..\..\..\libview\$(OBJDIR)\libstx_libview.dll: $(FORCE)
 	pushd ..\..\..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 
-libstx_libdb_libsqlite.dll: ..\..\..\libdb\libsqlite\$(OBJDIR)\libstx_libdb_libsqlite.dll
-	copy ..\..\..\libdb\libsqlite\$(OBJDIR)\libstx_libdb_libsqlite.dll *.*
-
-..\..\..\libdb\libsqlite\$(OBJDIR)\libstx_libdb_libsqlite.dll:
-	pushd ..\..\..\libdb\libsqlite & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-
-libstx_libdb_libodbc.dll: ..\..\..\libdb\libodbc\$(OBJDIR)\libstx_libdb_libodbc.dll
-	copy ..\..\..\libdb\libodbc\$(OBJDIR)\libstx_libdb_libodbc.dll *.*
+libstx_libui.dll: ..\..\..\libui\$(OBJDIR)\libstx_libui.dll
+	copy ..\..\..\libui\$(OBJDIR)\libstx_libui.dll *.*
 
-..\..\..\libdb\libodbc\$(OBJDIR)\libstx_libdb_libodbc.dll:
-	pushd ..\..\..\libdb\libodbc & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-
-libstx_libboss.dll: ..\..\..\libboss\$(OBJDIR)\libstx_libboss.dll
-	copy ..\..\..\libboss\$(OBJDIR)\libstx_libboss.dll *.*
-
-..\..\..\libboss\$(OBJDIR)\libstx_libboss.dll:
-	pushd ..\..\..\libboss & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+..\..\..\libui\$(OBJDIR)\libstx_libui.dll: $(FORCE)
+	pushd ..\..\..\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 
 libstx_libview2.dll: ..\..\..\libview2\$(OBJDIR)\libstx_libview2.dll
 	copy ..\..\..\libview2\$(OBJDIR)\libstx_libview2.dll *.*
 
-..\..\..\libview2\$(OBJDIR)\libstx_libview2.dll:
+..\..\..\libview2\$(OBJDIR)\libstx_libview2.dll: $(FORCE)
 	pushd ..\..\..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 
-libstx_libbasic3.dll: ..\..\..\libbasic3\$(OBJDIR)\libstx_libbasic3.dll
-	copy ..\..\..\libbasic3\$(OBJDIR)\libstx_libbasic3.dll *.*
-
-..\..\..\libbasic3\$(OBJDIR)\libstx_libbasic3.dll:
-	pushd ..\..\..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-
 libstx_goodies_sunit.dll: ..\..\..\goodies\sunit\$(OBJDIR)\libstx_goodies_sunit.dll
 	copy ..\..\..\goodies\sunit\$(OBJDIR)\libstx_goodies_sunit.dll *.*
 
-..\..\..\goodies\sunit\$(OBJDIR)\libstx_goodies_sunit.dll:
+..\..\..\goodies\sunit\$(OBJDIR)\libstx_goodies_sunit.dll: $(FORCE)
 	pushd ..\..\..\goodies\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 
-libstx_libui.dll: ..\..\..\libui\$(OBJDIR)\libstx_libui.dll
-	copy ..\..\..\libui\$(OBJDIR)\libstx_libui.dll *.*
-
-..\..\..\libui\$(OBJDIR)\libstx_libui.dll:
-	pushd ..\..\..\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-
 libstx_libwidg.dll: ..\..\..\libwidg\$(OBJDIR)\libstx_libwidg.dll
 	copy ..\..\..\libwidg\$(OBJDIR)\libstx_libwidg.dll *.*
 
-..\..\..\libwidg\$(OBJDIR)\libstx_libwidg.dll:
+..\..\..\libwidg\$(OBJDIR)\libstx_libwidg.dll: $(FORCE)
 	pushd ..\..\..\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 
+libstx_libhtml.dll: ..\..\..\libhtml\$(OBJDIR)\libstx_libhtml.dll
+	copy ..\..\..\libhtml\$(OBJDIR)\libstx_libhtml.dll *.*
+
+..\..\..\libhtml\$(OBJDIR)\libstx_libhtml.dll: $(FORCE)
+	pushd ..\..\..\libhtml & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+
 libstx_libwidg2.dll: ..\..\..\libwidg2\$(OBJDIR)\libstx_libwidg2.dll
 	copy ..\..\..\libwidg2\$(OBJDIR)\libstx_libwidg2.dll *.*
 
-..\..\..\libwidg2\$(OBJDIR)\libstx_libwidg2.dll:
+..\..\..\libwidg2\$(OBJDIR)\libstx_libwidg2.dll: $(FORCE)
 	pushd ..\..\..\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 
-libstx_libhtml.dll: ..\..\..\libhtml\$(OBJDIR)\libstx_libhtml.dll
-	copy ..\..\..\libhtml\$(OBJDIR)\libstx_libhtml.dll *.*
-
-..\..\..\libhtml\$(OBJDIR)\libstx_libhtml.dll:
-	pushd ..\..\..\libhtml & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-
 libstx_libtool.dll: ..\..\..\libtool\$(OBJDIR)\libstx_libtool.dll
 	copy ..\..\..\libtool\$(OBJDIR)\libstx_libtool.dll *.*
 
-..\..\..\libtool\$(OBJDIR)\libstx_libtool.dll:
+..\..\..\libtool\$(OBJDIR)\libstx_libtool.dll: $(FORCE)
 	pushd ..\..\..\libtool & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 
 libstx_libjava.dll: ..\..\$(OBJDIR)\libstx_libjava.dll
 	copy ..\..\$(OBJDIR)\libstx_libjava.dll *.*
 
-..\..\$(OBJDIR)\libstx_libjava.dll:
+..\..\$(OBJDIR)\libstx_libjava.dll: $(FORCE)
 	pushd ..\.. & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 
+      
+
 
-
-
-sources\NUL:
+sources\NUL: 
 	mkdir sources
 
 show:
@@ -460,8 +431,9 @@
 librun.dll: $(TOP)\librun\$(OBJDIR_LIBRUN)\librun.dll
 	copy $(TOP)\librun\$(OBJDIR_LIBRUN)\librun.dll librun.dll
 
-cs3245.dll: $(TOP)\support\win32\borland\cs3245.dll
-	copy $(TOP)\support\win32\borland\cs3245.dll cs3245.dll
+#cs3245.dll
+$(RT_DLL): $(TOP)\support\win32\borland\$(RT_DLL)
+	copy $(TOP)\support\win32\borland\$(RT_DLL) $(RT_DLL)
 
 X11.dll: $(TOP)\support\win32\X11.dll
 	copy $(TOP)\support\win32\X11.dll X11.dll
@@ -489,20 +461,19 @@
 	-del install_tomcat6.exe
 	-del stx.lib
 	-del stx.dll
-	-del cs3245.dll
+	-del $(RT_DLL)
 	-del $(REQUIRED_FILES)
 	-del main.c
 	-del *.log
-	-del *.res
+	-del *.$(RES)
 	-rmdir /S /Q resources
 	-rmdir /S /Q $(OBJDIR)
 
 clobber:: clean
 	-del *.dll *.exe *.com
 
-# stupid win-make does not allow empty - therefore echo something
 postBuildCleanup::
-	@-echo "postbuild cleanup"
+	@rem  stupid win-make does not allow empty
 
 # BEGINMAKEDEPEND --- do not remove this line; make depend needs it
 $(OUTDIR)ApacheTomcat6.$(O) ApacheTomcat6.$(H): ApacheTomcat6.st $(INCLUDE_TOP)\stx\libbasic\StandaloneStartup.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
hg/stx-libjava