Changeset 23790 for trunk/psphot

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

Location:

trunk/psphot

Files:

• configure.ac (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)

trunk/psphot/configure.ac

@@ -204 +204 @@
 echo "PSPHOT_LIBS: $PSPHOT_LIBS"
 
+IPP_VERSION(PSPHOT)
+AC_SUBST(PSPHOT_VERSION,[$PSPHOT_VERSION])
+AC_SUBST(PSPHOT_BRANCH,[$PSPHOT_BRANCH])
+AC_SUBST(PSPHOT_SOURCE,[$PSPHOT_SOURCE])
+
 AC_SUBST([PSPHOT_CFLAGS])
 AC_SUBST([PSPHOT_LIBS])

trunk/psphot/src/Makefile.am

@@ -1 +1 @@
 lib_LTLIBRARIES = libpsphot.la
 
-# PSPHOT_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
-# PSPHOT_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`
-# PSPHOT_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
-# 
-# # Force recompilation of psphotVersion.c, since it gets the version information
-# psphotVersion.c: FORCE
-#       touch psphotVersion.c
-# FORCE: ;
+# Force recompilation of psphotVersion.c, since it gets the version information
+psphotVersion.c: FORCE
+        touch psphotVersion.c
+FORCE: ;
 
-libpsphot_la_CFLAGS = $(PSPHOT_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPSPHOT_VERSION=$(PSPHOT_VERSION) -DPSPHOT_BRANCH=$(PSPHOT_BRANCH) -DPSPHOT_SOURCE=$(SVN_SOURCE)
+libpsphot_la_CFLAGS = $(PSPHOT_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPSPHOT_VERSION=$(PSPHOT_VERSION) -DPSPHOT_BRANCH=$(PSPHOT_BRANCH) -DPSPHOT_SOURCE=$(PSPHOT_SOURCE)
 libpsphot_la_LDFLAGS = $(PSPHOT_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)