--- a/examples/tomcat6/bc.mak Thu Sep 05 17:09:27 2013 +0100
+++ b/examples/tomcat6/bc.mak Thu Sep 05 22:08:59 2013 +0100
@@ -1,19 +1,19 @@
-# $Header: /cvs/stx/stx/libjava/examples/tomcat6/bc.mak,v 1.2 2013-02-25 11:15:32 vrany Exp $
+# $Header: /cvs/stx/stx/libjava/examples/tomcat6/bc.mak,v 1.3 2013-05-28 10:33:00 cg Exp $
#
-# 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)\..
CFLAGS_LOCAL=$(CFLAGS_APPTYPE) \
@@ -47,7 +47,7 @@
!ifdef USETCC
RESFILES=
!else
-RESFILES= tomcat6WinRC.res
+RESFILES= tomcat6WinRC.$(RES)
!endif
ALLOBJ= $(ALLOBJFILES) $(OBJS)
@@ -80,12 +80,12 @@
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 exe $(REQUIRED_SUPPORT_DIRS) ant postBuildCleanup setup
-exe: newBuildDate consoleApp
+exe: newBuildDate consoleApp
# the executable only
# with console
@@ -109,7 +109,7 @@
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
prereq:
@@ -219,7 +219,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
@@ -368,10 +368,10 @@
..\..\$(OBJDIR)\libstx_libjava.dll:
pushd ..\.. & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-
-sources\NUL:
+
+sources\NUL:
mkdir sources
show:
@@ -446,7 +446,7 @@
#
# additional rules
#
-tomcat6Win.res: tomcat6Win.rc tomcat6.ico
+tomcat6Win.$(RES): tomcat6Win.rc tomcat6.ico
main.$(O): buildDate.h main.c bc.mak