Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/ppStats/src/Makefile.am

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• ppStats/src (modified) (1 prop)
• ppStats/src/Makefile.am (modified) (1 diff)

branches/cnb_branches/cnb_branch_20090301/ppStats/src

@@ -10 +10 @@
 config.h.in
 stamp-h1
+ppStatsVersionDefinitions.h

@@ -10 +10 @@
 config.h.in
 stamp-h1
+ppStatsVersionDefinitions.h

branches/cnb_branches/cnb_branch_20090301/ppStats/src/Makefile.am

@@ -1 +1 @@
 lib_LTLIBRARIES = libppStats.la
 
-# PPSTATS_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
-# PPSTATS_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`
-# PPSTATS_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
-# 
-# # Force recompilation of ppStatsVersion.c, since it gets the version information
-# ppStatsVersion.c: FORCE
-#       touch ppStatsVersion.c
-# FORCE: ;
+if HAVE_SVNVERSION
+PPSTATS_VERSION=`$(SVNVERSION) ..`
+else
+PPSTATS_VERSION="UNKNOWN"
+endif
 
-libppStats_la_CFLAGS = $(PPSTATS_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPPSTATS_VERSION=$(SVN_VERSION) -DPPSTATS_BRANCH=$(SVN_BRANCH) -DPPSTATS_SOURCE=$(SVN_SOURCE)
+if HAVE_SVN
+PPSTATS_BRANCH=`$(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 }'`
+PPSTATS_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
+else
+PPSTATS_BRANCH="UNKNOWN"
+PPSTATS_SOURCE="UNKNOWN"
+endif
+
+# Force recompilation of ppStatsVersion.c, since it gets the version information
+ppStatsVersion.c: ppStatsVersionDefinitions.h
+ppStatsVersionDefinitions.h: ppStatsVersionDefinitions.h.in FORCE
+        -$(RM) ppStatsVersionDefinitions.h
+        $(SED) -e "s|@PPSTATS_VERSION@|\"$(PPSTATS_VERSION)\"|" -e "s|@PPSTATS_BRANCH@|\"$(PPSTATS_BRANCH)\"|" -e "s|@PPSTATS_SOURCE@|\"$(PPSTATS_SOURCE)\"|" ppStatsVersionDefinitions.h.in > ppStatsVersionDefinitions.h
+FORCE: ;
+
+libppStats_la_CFLAGS = $(PPSTATS_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
 libppStats_la_LDFLAGS = $(PPSTATS_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
 

@@ -10 +10 @@
 config.h.in
 stamp-h1
+ppStatsVersionDefinitions.h