--- a/Make.proto Wed Feb 08 01:53:01 2012 +0100
+++ b/Make.proto Wed Feb 08 01:53:17 2012 +0100
@@ -1,7 +1,7 @@
# $Header$
#
# DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libsvn at 2012-01-18 16:23:17.462.
+# automagically generated from the projectDefinition: stx_libsvn at 2012-02-08 00:52:44.937.
#
# Warning: once you modify this file, do not rerun
# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -63,21 +63,29 @@
all:: preMake classLibRule postMake
-pre_objs:: update-svn-revision
+pre_objs::
+
-update-svn-revision:
+# Update SVN revision in stx_libbasic3.st
+ifneq (,$(findstring .svn,$(wildcard .svn)))
+.svnversion: *.st
if [ -d .svn ]; then \
rev=$(shell svnversion -n); \
- if [ ! -r .svnversion -o "$$rev" != "$$(cat .svnversion)" ]; then \
- echo -n $$rev > .svnversion; \
- rev2=$$(printf "%15s" \'$$rev\'); \
- sed -i -e "s/\"\$$SVN\-Revision:\".*\"\$$\"/\"\$$SVN-Revision:\"$$rev2\"\$$\"/g" \
- stx_libsvn.st; \
- fi \
+ echo -n $$rev > .svnversion; \
+ else \
+ echo -n exported > .svnversion; \
fi
-.PHONY: update-svn-revision
+
+stx_libsvn.o: stx_libsvn.st .svnversion
+ if [ -d .svn ]; then \
+ rev2=$(shell svnversion -n); \
+ sed -e "s/\"\$$SVN\-Revision:\".*\"\$$\"/\"\$$SVN-Revision:\"$$rev2\"\$$\"/g" $< > .stx_libsvn.svn.st; \
+ fi
+ $(MAKE) CC="$(CLASSLIB_CC)" OPT="$(OPT)" SEPINITCODE="$(SEPINITCODE)" STC="$(STC)" STFILE=.stx_libsvn.svn $(O_RULE);
+ mv .stx_libsvn.svn.$(O) stx_libsvn.$(O)
+endif
@@ -100,16 +108,19 @@
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 ../libdb && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../libboss && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../goodies/xml/vw && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../libdb/libodbc && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../libdb/libsqlite && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../goodies/sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../libview3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../goodies/xml/vw && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../libhtml && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../libwidg3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../libtool && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../libtool2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../librun && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"