Changeset 23790 for trunk/psastro

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/psastro

Files:

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

trunk/psastro/configure.ac

@@ -193 +193 @@
 echo "PSASTRO_LIBS: $PSASTRO_LIBS"
 
+IPP_VERSION(PSASTRO)
+AC_SUBST(PSASTRO_VERSION,[$PSASTRO_VERSION])
+AC_SUBST(PSASTRO_BRANCH,[$PSASTRO_BRANCH])
+AC_SUBST(PSASTRO_SOURCE,[$PSASTRO_SOURCE])
+
 AC_SUBST([PSASTRO_CFLAGS])
 AC_SUBST([PSASTRO_LIBS])

trunk/psastro/src/Makefile.am

@@ -1 +1 @@
 lib_LTLIBRARIES = libpsastro.la
 
-libpsastro_la_CFLAGS = $(PSASTRO_CFLAGS) $(PPSTATS_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPSASTRO_VERSION=$(SVN_VERSION) -DPSASTRO_BRANCH=$(SVN_BRANCH) -DPSASTRO_SOURCE=$(SVN_SOURCE)
+libpsastro_la_CFLAGS = $(PSASTRO_CFLAGS) $(PPSTATS_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPSASTRO_VERSION=$(PSASTRO_VERSION) -DPSASTRO_BRANCH=$(PSASTRO_BRANCH) -DPSASTRO_SOURCE=$(PSASTRO_SOURCE)
 libpsastro_la_LDFLAGS = $(PSASTRO_LIBS) $(PPSTATS_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
 
 # Force recompilation of psastroVersion.c, since it gets the version information
-# can we do this with dependency info?
-# psastroVersion.c: FORCE
-# touch psastroVersion.c
-# FORCE: ;
+psastroVersion.c: FORCE
+        touch psastroVersion.c
+FORCE: ;
 
 bin_PROGRAMS = psastro psastroExtract psastroModel psastroModelFit gpcModel