Changeset 23790 for trunk/ppImage/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/ppImage/src/Makefile.am (modified) (1 diff)

trunk/ppImage/src/Makefile.am

@@ -4 +4 @@
         ppImage.h 
 
-#PPIMAGE_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
-#PPIMAGE_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`
-#PPIMAGE_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
+# Force recompilation of ppImageVersion.c, since it gets the version information
+ppImageVersion.c: FORCE
+        touch ppImageVersion.c
+FORCE: ;
 
-# Force recompilation of ppImageVersion.c, since it gets the version information
-# ppImageVersion.c: FORCE
-#       touch ppImageVersion.c
-# FORCE: ;
-
-ppImage_CFLAGS = $(PPIMAGE_CFLAGS) $(PPSTATS_CFLAGS) $(PSASTRO_CFLAGS) $(PSPHOT_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPPIMAGE_VERSION=$(SVN_VERSION) -DPPIMAGE_BRANCH=$(SVN_BRANCH) -DPPIMAGE_SOURCE=$(SVN_SOURCE)
+ppImage_CFLAGS = $(PPIMAGE_CFLAGS) $(PPSTATS_CFLAGS) $(PSASTRO_CFLAGS) $(PSPHOT_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPPIMAGE_VERSION=$(PPIMAGE_VERSION) -DPPIMAGE_BRANCH=$(PPIMAGE_BRANCH) -DPPIMAGE_SOURCE=$(PPIMAGE_SOURCE)
 ppImage_LDFLAGS = $(PPIMAGE_LIBS) $(PSASTRO_LIBS) $(PPSTATS_LIBS) $(PSPHOT_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
 ppImage_SOURCES = \