Changeset 24458 for trunk/ppNoiseMap/src/Makefile.am

Timestamp:

Jun 17, 2009, 8:33:56 AM (17 years ago)

Author:

eugene

Message:

ppNoiseMap builds correctly (but does nothing yet)

Location:

trunk/ppNoiseMap

Files:

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

trunk/ppNoiseMap/src/Makefile.am

@@ -4 +4 @@
         ppNoiseMap.h 
 
-ppNoiseMap_CFLAGS = $(PPNOISEMAP_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPPNOISEMAP_VERSION=$(SVN_VERSION) -DPPNOISEMAP_BRANCH=$(SVN_BRANCH) -DPPNOISEMAP_SOURCE=$(SVN_SOURCE)
+if HAVE_SVNVERSION
+PPNOISEMAP_VERSION=`$(SVNVERSION) ..`
+else
+PPNOISEMAP_VERSION="UNKNOWN"
+endif
+
+if HAVE_SVN
+PPIMAGE_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 }'`
+PPIMAGE_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
+else
+PPIMAGE_BRANCH="UNKNOWN"
+PPIMAGE_SOURCE="UNKNOWN"
+endif
+
+# Force recompilation of ppNoiseMapVersion.c, since it gets the version information
+ppNoiseMapVersion.c: ppNoiseMapVersionDefinitions.h
+ppNoiseMapVersionDefinitions.h: ppNoiseMapVersionDefinitions.h.in FORCE
+        -$(RM) ppNoiseMapVersionDefinitions.h
+        $(SED) -e "s|@PPNOISEMAP_VERSION@|\"$(PPNOISEMAP_VERSION)\"|" -e "s|@PPNOISEMAP_BRANCH@|\"$(PPNOISEMAP_BRANCH)\"|" -e "s|@PPNOISEMAP_SOURCE@|\"$(PPNOISEMAP_SOURCE)\"|" ppNoiseMapVersionDefinitions.h.in > ppNoiseMapVersionDefinitions.h
+FORCE: ;
+
+BUILT_SOURCES = ppNoiseMapVersionDefinitions.h
+
+ppNoiseMap_CFLAGS = $(PPNOISEMAP_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
 ppNoiseMap_LDFLAGS = $(PPNOISEMAP_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
 ppNoiseMap_SOURCES = \
@@ -12 +35 @@
         ppNoiseMapLoop.c \
         ppNoiseMapCleanup.c \
-        ppNoiseMapFileCheck.c \
         ppNoiseMapVersion.c \
         ppNoiseMapDefineFile.c