Changeset 28334 for branches/czw_branch/20100519/ppBackground/src/Makefile.am

Timestamp:

Jun 15, 2010, 11:22:56 AM (16 years ago)

Author:

watersc1

Message:

association and jpegs look fine. random simtest errors are a bit worrying, though.

Location:

branches/czw_branch/20100519

Files:

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

branches/czw_branch/20100519/ppBackground/src/Makefile.am

@@ -2 +2 @@
 
 if HAVE_SVNVERSION
-PPVIZPATTERN_VERSION=`$(SVNVERSION) ..`
+PPBACKGROUND_VERSION=`$(SVNVERSION) ..`
 else
-PPVIZPATTERN_VERSION="UNKNOWN"
+PPBACKGROUND_VERSION="UNKNOWN"
 endif
 
 if HAVE_SVN
-PPVIZPATTERN_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 }'`
-PPVIZPATTERN_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
+PPBACKGROUND_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 }'`
+PPBACKGROUND_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
 else
-PPVIZPATTERN_BRANCH="UNKNOWN"
-PPVIZPATTERN_SOURCE="UNKNOWN"
+PPBACKGROUND_BRANCH="UNKNOWN"
+PPBACKGROUND_SOURCE="UNKNOWN"
 endif
 
@@ -19 +19 @@
 ppBackgroundVersionDefinitions.h: ppBackgroundVersionDefinitions.h.in FORCE
         -$(RM) ppBackgroundVersionDefinitions.h
-        $(SED) -e "s|@PPVIZPATTERN_VERSION@|\"$(PPVIZPATTERN_VERSION)\"|" -e "s|@PPVIZPATTERN_BRANCH@|\"$(PPVIZPATTERN_BRANCH)\"|" -e "s|@PPVIZPATTERN_SOURCE@|\"$(PPVIZPATTERN_SOURCE)\"|" ppBackgroundVersionDefinitions.h.in > ppBackgroundVersionDefinitions.h
+        $(SED) -e "s|@PPBACKGROUND_VERSION@|\"$(PPBACKGROUND_VERSION)\"|" -e "s|@PPBACKGROUND_BRANCH@|\"$(PPBACKGROUND_BRANCH)\"|" -e "s|@PPBACKGROUND_SOURCE@|\"$(PPBACKGROUND_SOURCE)\"|" ppBackgroundVersionDefinitions.h.in > ppBackgroundVersionDefinitions.h
 FORCE: ;
 
@@ -25 +25 @@
 
 
-ppBackground_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSPHOT_CFLAGS) $(PPBACKGROUND_CFLAGS)
-ppBackground_LDFLAGS  = $(PSLIB_LIBS)   $(PSMODULE_LIBS)   $(PSPHOT_LIBS)   $(PPBACKGROUND_LIBS)
+ppBackground_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PPSTATS_CFLAGS) $(PSPHOT_CFLAGS) $(PPBACKGROUND_CFLAGS)
+ppBackground_LDFLAGS  = $(PSLIB_LIBS)   $(PSMODULE_LIBS)   $(PPSTATS_LIBS)   $(PSPHOT_LIBS)   $(PPBACKGROUND_LIBS)
 
 ppBackground_SOURCES =          \
@@ -35 +35 @@
         ppBackgroundLoop.c      \
         ppBackgroundVersion.c   \
-        ppBackgroundModel.c     \
-        ppBackgroundErrorCodes.c
+        ppBackgroundRestore.c   \
+        ppBackgroundErrorCodes.c        \
+        ppBackgroundExit.c
 
 noinst_HEADERS = \