class: ApplicationDefinition
authorStefan Vogel <sv@exept.de>
Mon, 18 Mar 2013 15:06:53 +0100
changeset 14891 7bf0716c431b
parent 14890 37618c9121f2
child 14892 77c2f020de5d
class: ApplicationDefinition changed: #bc_dot_mak
ApplicationDefinition.st
--- a/ApplicationDefinition.st	Mon Mar 18 14:39:49 2013 +0100
+++ b/ApplicationDefinition.st	Mon Mar 18 15:06:53 2013 +0100
@@ -1608,11 +1608,15 @@
 
 TOP=%(TOP)       
 INCLUDE_TOP=$(TOP)\..
+
+!!ifndef FORCE
 # dummy target to force a build
 FORCE=FORCE_BUILD
-
-FORCE_BUILD:
-        @rem Dummy traget to force a build
+!!endif
+# An old file, used as a dummy traget 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
+
 
 CFLAGS_LOCAL=$(CFLAGS_APPTYPE) \
  -DSTARTUP_CLASS="\"%(STARTUP_CLASS)\"" \
@@ -1663,11 +1667,11 @@
 target: %(BUILD_TARGET) postBuildCleanup 
 
 # the executable, all required files and a self-installing-installer-exe
-ALL:: ALL2 
+ALL:: exe $(REQUIRED_SUPPORT_DIRS)  postBuildCleanup setup 
 
 # all, but no prereqs
 ALL_NP::
-    $(MAKE) FORCE= exe $(REQUIRED_SUPPORT_DIRS) %(ADDITIONAL_TARGETS) postBuildCleanup setup 
+    $(MAKE) -N -f bc.mak FORCE=$(OLD_FILE) ALL 
 
 exe:  newBuildDate $(REQUIRED_LIBOBJS) %(NOCONSOLE_APPLICATION_OR_EMPTY) %(CONSOLE_APPLICATION_OR_EMPTY) 
 
@@ -1676,6 +1680,7 @@
 consoleApp: $(REQUIRED_LIBS)
         -del main.$(O)
         $(MAKE) -N -f bc.mak $(USE_ARG) \
+                FORCE=$(OLD_FILE) \
                 MAKE_BAT=$(MAKE_BAT) \
                 PROJECT=$(PROJECT_CONSOLE) \
                 CFLAGS_APPTYPE=" -DWIN32GUI $(CFLAGS_CONSOLE)" \
@@ -1686,6 +1691,7 @@
 noConsoleApp: $(REQUIRED_LIBS)
         -del main.$(O)
         $(MAKE) -N -f bc.mak $(USE_ARG) \
+                FORCE=$(OLD_FILE) \
                 MAKE_BAT=$(MAKE_BAT) \
                 PROJECT=$(PROJECT_NOCONSOLE) \
                 CFLAGS_APPTYPE=" -DWIN32GUI $(CFLAGS_NOCONSOLE) -DWIN_LOGFILE="\\"\"%(NOCONSOLE_LOGFILE)\\"\""" \
@@ -1695,6 +1701,9 @@
 # the executable only (internal target; needs some defines)
 theExe: $(OUTDIR) $(OBJS) $(REQUIRED_FILES) show $(PROJECT) 
 
+FORCE_BUILD:
+        @rem Dummy target to force a build
+
 # build all mandatory prerequisite packages (containing superclasses) for this package
 prereq:
 %(MAKE_PREREQUISITES)
@@ -1852,9 +1861,8 @@
 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
 %(DEPENDENCIES)
@@ -2937,11 +2945,11 @@
 !ApplicationDefinition class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/ApplicationDefinition.st,v 1.223 2013-03-15 16:55:51 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ApplicationDefinition.st,v 1.224 2013-03-18 14:06:53 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/ApplicationDefinition.st,v 1.223 2013-03-15 16:55:51 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ApplicationDefinition.st,v 1.224 2013-03-18 14:06:53 stefan Exp $'
 !
 
 version_SVN