--- a/ApplicationDefinition.st Sat Sep 06 16:47:32 2008 +0200
+++ b/ApplicationDefinition.st Sat Sep 06 16:47:35 2008 +0200
@@ -1826,7 +1826,6 @@
at: 'DEPENDENCIES' put: (self generateDependencies_win32);
at: 'SUBPROJECTS_LIBS' put: (self generateSubProjectLines_bc_dot_mak );
at: 'BUILD_TARGET' put: (self buildTarget );
- at: 'MAKE_PREREQUISITES' put: (self generateRequiredMakePrerequisites_bc_dot_mak);
yourself.
self needResources ifTrue:[
@@ -1924,8 +1923,7 @@
at: 'STARTUP_SELECTOR' put: (self startupSelector );
at: 'REQUIRED_LIBS' put: (self generateRequiredLibs_make_dot_proto);
at: 'REQUIRED_LIBOBJS' put: (self generateRequiredLibobjs_make_dot_proto);
- at: 'REQUIRED_LINK_LIBOBJS' put: (self generateRequiredLinkLibobjs_make_dot_proto);
- at: 'MAKE_PREREQUISITES' put: (self generateRequiredMakePrerequisites_make_dot_proto).
+ at: 'REQUIRED_LINK_LIBOBJS' put: (self generateRequiredLinkLibobjs_make_dot_proto).
self offerSmalltalkSourceCode ifTrue:[
mappings
@@ -2286,45 +2284,6 @@
"
!
-generateRequiredMakePrerequisites_bc_dot_mak
- |last|
-
- ^ String streamContents:[:s |
- last := self package.
- "Note: the trailing blank in 'CFLAGS_LOCAL=$(GLOBALDEFINES) '
- is required!!"
- (self allPreRequisitesSorted copyWith:'stx:librun') do:[:projectID |
- s tab; nextPutLine:'cd ', (self msdosPathToPackage:projectID from:last).
- s tab; nextPutLine:'bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "'.
- last := projectID.
- ].
- s tab; nextPutLine:'cd ', (self msdosPathToPackage:(self package) from:last).
- ].
-
- "
- exept_expecco_application generateRequiredMakePrerequisites_bc_dot_mak
- alspa_batch_application generateRequiredMakePrerequisites_bc_dot_mak
- "
-!
-
-generateRequiredMakePrerequisites_make_dot_proto
- |libPath|
-
- ^ String streamContents:[:s |
- (self allPreRequisitesSorted copyWith:'stx:librun') do:[:projectID |
- libPath := self pathToPackage_unix:projectID.
- s tab; nextPutAll: '(cd ', libPath; nextPutLine:' ; $(MAKE))'.
- ].
-
- s cr.
- ].
-
- "
- exept_expecco_application generateRequiredMakePrerequisites_make_dot_proto
- alspa_batch_application generateRequiredMakePrerequisites_make_dot_proto
- "
-!
-
generateSubProjectLines_bc_dot_mak
^ String streamContents:[:s |
@@ -2425,5 +2384,5 @@
!ApplicationDefinition class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/ApplicationDefinition.st,v 1.116 2008-07-29 12:47:42 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/ApplicationDefinition.st,v 1.117 2008-09-06 14:47:35 cg Exp $'
! !