diff -r bfde5434dcdd -r be55f85e2ebf Make.proto --- a/Make.proto Sat Oct 10 17:57:31 2009 +0200 +++ b/Make.proto Sat Oct 10 17:58:35 2009 +0200 @@ -1,6 +1,6 @@ # $Header$ # -# DO NOT EDIT +# DO NOT EDIT # automagically generated from the projectDefinition: stx_libtool2. # # Warning: once you modify this file, do not rerun @@ -30,15 +30,15 @@ REQUIRED_SUPPORT_DIRS= -# if your embedded C code requires any system includes, -# add the path(es) here:, +# if your embedded C code requires any system includes, +# add the path(es) here:, # ********** OPTIONAL: MODIFY the next lines *** # LOCALINCLUDES=-Ifoo -Ibar LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libview -I$(INCLUDE_TOP)/stx/libwidg -I$(INCLUDE_TOP)/stx/libview2 -I$(INCLUDE_TOP)/stx/libwidg2 -I$(INCLUDE_TOP)/stx/libbasic -# if you need any additional defines for embedded C code, -# add them here:, +# if you need any additional defines for embedded C code, +# add them here:, # ********** OPTIONAL: MODIFY the next lines *** # LOCALDEFINES=-Dfoo -Dbar -DDEBUG LOCALDEFINES= @@ -63,7 +63,9 @@ all:: preMake classLibRule postMake -pre_objs:: +pre_objs:: + + @@ -80,19 +82,19 @@ postMake:: cleanjunk prereq: $(REQUIRED_SUPPORT_DIRS) - (cd ../libbasic ; $(MAKE)) - (cd ../goodies/refactoryBrowser/parser ; $(MAKE)) - (cd ../libbasic2 ; $(MAKE)) - (cd ../libcomp ; $(MAKE)) - (cd ../libview ; $(MAKE)) - (cd ../libbasic3 ; $(MAKE)) - (cd ../libview2 ; $(MAKE)) - (cd ../libui ; $(MAKE)) - (cd ../libwidg ; $(MAKE)) - (cd ../libwidg2 ; $(MAKE)) - (cd ../libwidg3 ; $(MAKE)) - (cd ../libtool ; $(MAKE)) - (cd ../librun ; $(MAKE)) + cd ../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)" + cd ../goodies/refactoryBrowser/parser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)" + cd ../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)" + cd ../libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)" + cd ../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)" + cd ../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)" + cd ../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)" + cd ../libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)" + cd ../libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)" + cd ../libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)" + cd ../libwidg3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)" + cd ../libtool && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)" + cd ../librun && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)" @@ -111,6 +113,7 @@ $(OUTDIR)FlyByWindowInformation.$(O) FlyByWindowInformation.$(H): FlyByWindowInformation.st $(INCLUDE_TOP)/stx/libview2/FlyByHelp.$(H) $(INCLUDE_TOP)/stx/libview2/ActiveHelp.$(H) $(INCLUDE_TOP)/stx/libview2/EventListener.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)ImageEditor.$(O) ImageEditor.$(H): ImageEditor.st $(INCLUDE_TOP)/stx/libview2/ResourceSpecEditor.$(H) $(INCLUDE_TOP)/stx/libview2/ToolApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)MenuEditor.$(O) MenuEditor.$(H): MenuEditor.st $(INCLUDE_TOP)/stx/libview2/ResourceSpecEditor.$(H) $(INCLUDE_TOP)/stx/libview2/ToolApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(STCHDR) +$(OUTDIR)ProjectBuilder.$(O) ProjectBuilder.$(H): ProjectBuilder.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)SelectionBrowser.$(O) SelectionBrowser.$(H): SelectionBrowser.st $(INCLUDE_TOP)/stx/libview2/SimpleDialog.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)TabListEditor.$(O) TabListEditor.$(H): TabListEditor.st $(INCLUDE_TOP)/stx/libview2/ResourceSpecEditor.$(H) $(INCLUDE_TOP)/stx/libview2/ToolApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)UIGalleryView.$(O) UIGalleryView.$(H): UIGalleryView.st $(INCLUDE_TOP)/stx/libwidg2/NoteBookView.$(H) $(INCLUDE_TOP)/stx/libview/View.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/DropObject.$(H) $(STCHDR)