Changeset 23790 for trunk/ppSub/src/Makefile.am

Timestamp:

Apr 9, 2009, 6:06:36 PM (17 years ago)

Author:

Paul Price

Message:

Fixed version information in builds: determined separately (and singly!) for each component

File:

• trunk/ppSub/src/Makefile.am (modified) (1 diff)

trunk/ppSub/src/Makefile.am

@@ -1 +1 @@
 bin_PROGRAMS = ppSub ppSubKernel
 
-# PPSUB_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
-# PPSUB_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else svn info | sed -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'; fi`
-# PPSUB_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
-# 
-# # Force recompilation of ppSubVersion.c, since it gets the version information
-# ppSubVersion.c: FORCE
-#       touch ppSubVersion.c
-# FORCE: ;
+# Force recompilation of ppSubVersion.c, since it gets the version information
+ppSubVersion.c: FORCE
+        touch ppSubVersion.c
+FORCE: ;
 
-ppSub_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PPSTATS_CFLAGS) $(PSPHOT_CFLAGS) $(PPSUB_CFLAGS) -DPPSUB_VERSION=$(SVN_VERSION) -DPPSUB_BRANCH=$(SVN_BRANCH) -DPPSUB_SOURCE=$(SVN_SOURCE)
+ppSub_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PPSTATS_CFLAGS) $(PSPHOT_CFLAGS) $(PPSUB_CFLAGS) -DPPSUB_VERSION=$(PPSUB_VERSION) -DPPSUB_BRANCH=$(PPSUB_BRANCH) -DPPSUB_SOURCE=$(PPSUB_SOURCE)
 ppSub_LDFLAGS  = $(PSLIB_LIBS)   $(PSMODULE_LIBS)   $(PPSTATS_LIBS)   $(PSPHOT_LIBS)   $(PPSUB_LIBS)