Changeset 38057 for branches/eam_branches/ipp-20150112/psphot/src/Makefile.am

Timestamp:

Mar 29, 2015, 5:55:41 AM (11 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20150112/psphot

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/Makefile.am (modified) (2 diffs)

branches/eam_branches/ipp-20150112/psphot/src

@@ -27 +27 @@
 psmakecff
 psphotFullForceSummary
+psphotVersionDefinitions.h.tmp

@@ -27 +27 @@
 psmakecff
 psphotFullForceSummary
+psphotVersionDefinitions.h.tmp

branches/eam_branches/ipp-20150112/psphot/src/Makefile.am

@@ -1 +1 @@
 lib_LTLIBRARIES = libpsphot.la
-
-if HAVE_SVNVERSION
-PSPHOT_VERSION=`$(SVNVERSION) ..`
-else
-PSPHOT_VERSION="UNKNOWN"
-endif
-
-if HAVE_SVN
-PSPHOT_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 }'`
-PSPHOT_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
-else
-PSPHOT_BRANCH="UNKNOWN"
-PSPHOT_SOURCE="UNKNOWN"
-endif
 
 # Force recompilation of psphotVersion.c, since it gets the version information
 psphotVersion.c: psphotVersionDefinitions.h
 psphotVersionDefinitions.h: psphotVersionDefinitions.h.in FORCE
-        -$(RM) psphotVersionDefinitions.h
-        $(SED) -e "s|@PSPHOT_VERSION@|\"$(PSPHOT_VERSION)\"|" -e "s|@PSPHOT_BRANCH@|\"$(PSPHOT_BRANCH)\"|" -e "s|@PSPHOT_SOURCE@|\"$(PSPHOT_SOURCE)\"|" psphotVersionDefinitions.h.in > psphotVersionDefinitions.h
+        pslib-setsvnversion.pl PSPHOT psphotVersionDefinitions.h.in psphotVersionDefinitions.h
 FORCE: ;
 
@@ -230 +215 @@
         psphotLoadSRCTEXT.c            \
         psphotReadoutCleanup.c         \
+        psphotStatsFile.c              \
         psphotSourcePlots.c            \
         psphotRadialPlot.c             \

@@ -27 +27 @@
 psmakecff
 psphotFullForceSummary
+psphotVersionDefinitions.h.tmp