Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/pswarp/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)
• pswarp/src (modified) (1 prop)
• pswarp/src/Makefile.am (modified) (2 diffs)

branches/cnb_branches/cnb_branch_20090301/pswarp/src

@@ -13 +13 @@
 config.h.in
 stamp-h1
+pswarpVersionDefinitions.h

@@ -13 +13 @@
 config.h.in
 stamp-h1
+pswarpVersionDefinitions.h

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

@@ -1 +1 @@
 bin_PROGRAMS = pswarp
 
-PSWARP_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
-PSWARP_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`
-PSWARP_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
+if HAVE_SVNVERSION
+PSWARP_VERSION=`$(SVNVERSION) ..`
+else
+PSWARP_VERSION="UNKNOWN"
+endif
+
+if HAVE_SVN
+PSWARP_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 }'`
+PSWARP_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
+else
+PSWARP_BRANCH="UNKNOWN"
+PSWARP_SOURCE="UNKNOWN"
+endif
 
 # Force recompilation of pswarpVersion.c, since it gets the version information
-pswarpVersion.c: FORCE
-        touch pswarpVersion.c
+pswarpVersion.c: pswarpVersionDefinitions.h
+pswarpVersionDefinitions.h: pswarpVersionDefinitions.h.in FORCE
+        -$(RM) pswarpVersionDefinitions.h
+        $(SED) -e "s|@PSWARP_VERSION@|\"$(PSWARP_VERSION)\"|" -e "s|@PSWARP_BRANCH@|\"$(PSWARP_BRANCH)\"|" -e "s|@PSWARP_SOURCE@|\"$(PSWARP_SOURCE)\"|" pswarpVersionDefinitions.h.in > pswarpVersionDefinitions.h
 FORCE: ;
 
-pswarp_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PPSTATS_CFLAGS) $(PSPHOT_CFLAGS) $(PSWARP_CFLAGS) -DPSWARP_VERSION=\"$(PSWARP_VERSION)\" -DPSWARP_BRANCH=\"$(PSWARP_BRANCH)\" -DPSWARP_SOURCE=\"$(PSWARP_SOURCE)\"
+pswarp_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PPSTATS_CFLAGS) $(PSPHOT_CFLAGS) $(PSWARP_CFLAGS)
 pswarp_LDFLAGS = $(PSLIB_LIBS) $(PSMODULE_LIBS) $(PPSTATS_LIBS) $(PSPHOT_LIBS) $(PSWARP_LIBS)
 
@@ -24 +36 @@
         pswarpMatchRange.c              \
         pswarpParseCamera.c             \
-        pswarpPixelFraction.c           \
+        pswarpPixelsLit.c               \
         pswarpSetMaskBits.c             \
         pswarpSetThreads.c              \

@@ -13 +13 @@
 config.h.in
 stamp-h1
+pswarpVersionDefinitions.h