--- a/ApplicationDefinition.st	Mon May 04 16:10:49 2009 +0200
+++ b/ApplicationDefinition.st	Mon May 04 16:56:41 2009 +0200
@@ -712,12 +712,6 @@
 CRT_STARTUP_CONSOLE=c0x32.obj
 CRT_STARTUP_NOCONSOLE=c0w32.obj
 
-# notice: the following 3 are now defined via the make-stx and make-winstx rules.
-#
-# CFLAGS_APPTYPE=$(CFLAGS_%(CONSOLE_OR_NOCONSOLE))
-# LFLAGS_APPTYPE=$(LFLAGS_%(CONSOLE_OR_NOCONSOLE))
-# CRT_STARTUP=$(CRT_STARTUP_%(CONSOLE_OR_NOCONSOLE))
-
 CFLAGS_LOCAL=$(CFLAGS_APPTYPE) \
  -DSTARTUP_CLASS="\"%(STARTUP_CLASS)\"" \
  -DSTARTUP_SELECTOR="\"%(STARTUP_SELECTOR)\"" \
@@ -766,14 +760,11 @@
 # the executable, all required files and a self-installing-installer-exe
 ALL:: prereq exe setup
 
-# old
-# exe:  newBuildDate %(APPLICATION_OR_CONSOLEAPPLICATION) $(REQUIRED_SUPPORT_DIRS) %(ADDITIONAL_TARGETS)
-# new: allow for both to be made
 exe:  newBuildDate %(NOCONSOLE_APPLICATION_OR_EMPTY) %(CONSOLE_APPLICATION_OR_EMPTY) $(REQUIRED_SUPPORT_DIRS) %(ADDITIONAL_TARGETS)
 
 # the executable only
 # with console
-%(CONSOLE_APPLICATION):
+consoleApp:
         -del main.obj
         $(MAKE) -N -f bc.mak \
                 PROJECT=$(PROJECT_CONSOLE) \
@@ -782,7 +773,7 @@
                 CRT_STARTUP="$(CRT_STARTUP_CONSOLE)" theExe
 
 # without console
-%(NOCONSOLE_APPLICATION):
+noConsoleApp:
         -del main.obj
         $(MAKE) -N -f bc.mak \
                 PROJECT=$(PROJECT_NOCONSOLE) \
@@ -898,9 +889,8 @@
         -rmdir /S /Q resources
         -rmdir /S /Q objbc
 
-clobber::
-        -del *.dll
-        -del *.exe
+clobber:: clean
+        -del *.dll *.exe *.com
 
 # BEGINMAKEDEPEND --- do not remove this line; make depend needs it
 %(DEPENDENCIES)
@@ -1874,10 +1864,8 @@
     d := super bc_dot_mak_mappings.
     d 
         at: 'LOCAL_INCLUDES' put: (self generateLocalIncludes_win32);
-        at: 'CONSOLE_OR_NOCONSOLE' put:(self isConsoleApplication ifTrue:'CONSOLE' ifFalse:'NOCONSOLE');
-        at: 'APPLICATION_OR_CONSOLEAPPLICATION' put:(self isConsoleApplication ifTrue:[self applicationNameConsole] ifFalse:[self applicationNameNoConsole]);
-        at: 'CONSOLE_APPLICATION_OR_EMPTY' put:(self makeConsoleApplication ifTrue:[self applicationNameConsole] ifFalse:'');
-        at: 'NOCONSOLE_APPLICATION_OR_EMPTY' put:(self makeNonConsoleApplication ifTrue:[self applicationNameNoConsole] ifFalse:'');
+        at: 'CONSOLE_APPLICATION_OR_EMPTY' put:(self makeConsoleApplication ifTrue:['consoleApp'] ifFalse:'');
+        at: 'NOCONSOLE_APPLICATION_OR_EMPTY' put:(self makeNonConsoleApplication ifTrue:['noConsoleApp'] ifFalse:'');
         at: 'APPLICATION' put: (self applicationName);
         at: 'NSI_FILENAME' put: self nsiFilename ;
         at: 'CONSOLE_APPLICATION' put: (self applicationNameConsole);
@@ -2562,5 +2550,5 @@
 !ApplicationDefinition class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/ApplicationDefinition.st,v 1.132 2009-05-04 14:10:49 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ApplicationDefinition.st,v 1.133 2009-05-04 14:56:41 stefan Exp $'
 ! !