--- a/ProjectDefinition.st	Thu Apr 21 07:59:19 2016 +0100
+++ b/ProjectDefinition.st	Fri Apr 22 08:34:39 2016 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 2006 by eXept Software AG
               All Rights Reserved
@@ -2746,6 +2744,7 @@
     "Created: / 18-08-2006 / 12:51:38 / cg"
 ! !
 
+
 !ProjectDefinition class methodsFor:'description - project information'!
 
 applicationAdditionalIconFileNames
@@ -4781,6 +4780,7 @@
     ^ self subProjectMakeCallsUsing:'call vcmake %1 %2'.
 ! !
 
+
 !ProjectDefinition class methodsFor:'file templates'!
 
 autopackage_default_dot_apspec
@@ -4908,10 +4908,8 @@
 
 make.exe -N -f bc.mak  %%DEFINES%% %%*
 
+%(SKIP_IF_ARG_IS_APP_TARGET)
 @IF "%%1" EQU "test" exit /b 0
-@IF "%%1" EQU "exe" exit /b 0
-@IF "%%1" EQU "setup" exit /b 0
-@IF "%%1" EQU "pluginSetup" exit /b 0
 
 %(SUBPROJECT_BMAKE_CALLS)
 '
@@ -4991,10 +4989,8 @@
 @REM -------
 make.exe -N -f bc.mak -DUSELCC=1 %%*
 
+%(SKIP_IF_ARG_IS_APP_TARGET)
 @IF "%%1" EQU "test" exit /b 0
-@IF "%%1" EQU "exe" exit /b 0
-@IF "%%1" EQU "setup" exit /b 0
-@IF "%%1" EQU "pluginSetup" exit /b 0
 
 %(SUBPROJECT_LCCMAKE_CALLS)
 '
@@ -5124,10 +5120,8 @@
 @popd
 make.exe -N -f bc.mak %DEFINES% %%USEMINGW_ARG%% %%*
 
+%(SKIP_IF_ARG_IS_APP_TARGET)
 @IF "%%1" EQU "test" exit /b 0
-@IF "%%1" EQU "exe" exit /b 0
-@IF "%%1" EQU "setup" exit /b 0
-@IF "%%1" EQU "pluginSetup" exit /b 0
 
 %(SUBPROJECT_MINGWMAKE_CALLS)
 '
@@ -5221,9 +5215,7 @@
 make.exe -N -f bc.mak -DUSETCC=1 %%*
 
 @IF "%%1" EQU "test" exit /b 0
-@IF "%%1" EQU "exe" exit /b 0
-@IF "%%1" EQU "setup" exit /b 0
-@IF "%%1" EQU "pluginSetup" exit /b 0
+%(SKIP_IF_ARG_IS_APP_TARGET)
 
 
 %(SUBPROJECT_TCCMAKE_CALLS)
@@ -5255,10 +5247,8 @@
 
 make.exe -N -f bc.mak -DUSEVC=1 %DEFINES% %*
 
+%(SKIP_IF_ARG_IS_APP_TARGET)
 @IF "%%1" EQU "test" exit /b 0
-@IF "%%1" EQU "exe" exit /b 0
-@IF "%%1" EQU "setup" exit /b 0
-@IF "%%1" EQU "pluginSetup" exit /b 0
 
 %(SUBPROJECT_VCMAKE_CALLS)
 '