--- a/Make.proto Fri Feb 17 00:21:28 2012 +0100
+++ b/Make.proto Fri Feb 17 00:21:38 2012 +0100
@@ -1,7 +1,7 @@
-# $Header: /cvs/stx/stx/libcomp/Make.proto,v 1.107 2011-12-07 10:36:55 vrany Exp $
+# $Header: /cvs/stx/stx/libcomp/Make.proto,v 1.108 2012-02-16 23:21:38 vrany Exp $
#
# DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libcomp at 2011-12-06 21:25:52.149.
+# automagically generated from the projectDefinition: stx_libcomp at 2012-02-16 23:21:18.266.
#
# Warning: once you modify this file, do not rerun
# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -63,17 +63,29 @@
all:: preMake classLibRule postMake
-pre_objs:: update-svn-revision
+pre_objs::
+
-update-svn-revision:
- if [ ! -r .svnversion -o "$(shell svnversion -n)" != "$(shell cat .svnversion)" ]; then \
- svnversion -n > .svnversion; \
- sed -i -e "s/\"\$$SVN\-Revision:\".*\"\$$\"/\"\$$SVN-Revision:\"'$(shell svnversion -n)'\"\$$\"/g" \
- stx_libcomp.st; \
+# Update SVN revision in stx_libbasic3.st
+ifneq (,$(findstring .svn,$(wildcard .svn)))
+.svnversion: *.st
+ if [ -d .svn ]; then \
+ rev=$(shell svnversion -n); \
+ echo -n $$rev > .svnversion; \
+ else \
+ echo -n exported > .svnversion; \
fi
-.PHONY: update-svn-revision
+
+stx_libcomp.o: stx_libcomp.st .svnversion
+ if [ -d .svn ]; then \
+ rev2=$(shell svnversion -n); \
+ sed -e "s/\"\$$SVN\-Revision:\".*\"\$$\"/\"\$$SVN-Revision:\"$$rev2\"\$$\"/g" $< > .stx_libcomp.svn.st; \
+ fi
+ $(MAKE) CC="$(CLASSLIB_CC)" OPT="$(OPT)" SEPINITCODE="$(SEPINITCODE)" STC="$(STC)" STFILE=.stx_libcomp.svn $(O_RULE);
+ mv .stx_libcomp.svn.$(O) stx_libcomp.$(O)
+endif
@@ -134,9 +146,10 @@
$(OUTDIR)BreakpointNode.$(O) BreakpointNode.$(H): BreakpointNode.st $(INCLUDE_TOP)/stx/libcomp/ParseNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)MessageNode.$(O) MessageNode.$(H): MessageNode.st $(INCLUDE_TOP)/stx/libcomp/ParseNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)ParseErrorNode.$(O) ParseErrorNode.$(H): ParseErrorNode.st $(INCLUDE_TOP)/stx/libcomp/ParseNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)Parser.$(O) Parser.$(H): Parser.st $(INCLUDE_TOP)/stx/libcomp/Scanner.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/Query.$(H) $(INCLUDE_TOP)/stx/libbasic/Notification.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(STCHDR)
+$(OUTDIR)Parser.$(O) Parser.$(H): Parser.st $(INCLUDE_TOP)/stx/libcomp/Scanner.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Query.$(H) $(INCLUDE_TOP)/stx/libbasic/Notification.$(H) $(STCHDR)
$(OUTDIR)PrimaryNode.$(O) PrimaryNode.$(H): PrimaryNode.st $(INCLUDE_TOP)/stx/libcomp/ParseNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)ProgramNode.$(O) ProgramNode.$(H): ProgramNode.st $(INCLUDE_TOP)/stx/libcomp/ParseNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)SelectorNode.$(O) SelectorNode.$(H): SelectorNode.st $(INCLUDE_TOP)/stx/libcomp/ParseNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)StatementNode.$(O) StatementNode.$(H): StatementNode.st $(INCLUDE_TOP)/stx/libcomp/ParseNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)TextCollectingCompilationErrorHandler.$(O) TextCollectingCompilationErrorHandler.$(H): TextCollectingCompilationErrorHandler.st $(INCLUDE_TOP)/stx/libcomp/CompilationErrorHandler.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)WarningCompilationErrorHandler.$(O) WarningCompilationErrorHandler.$(H): WarningCompilationErrorHandler.st $(INCLUDE_TOP)/stx/libcomp/CompilationErrorHandler.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)