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

branches/cnb_branches/cnb_branch_20090301/ppSub/src

@@ -10 +10 @@
 stamp-h1
 ppSubKernel
+ppSubErrorCodes.h
+ppSubErrorCodes.c
+ppSubVersionDefinitions.h

@@ -10 +10 @@
 stamp-h1
 ppSubKernel
+ppSubErrorCodes.h
+ppSubErrorCodes.c
+ppSubVersionDefinitions.h

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

@@ -1 +1 @@
 bin_PROGRAMS = ppSub ppSubKernel
 
-# PPSUB_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
-# PPSUB_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`
-# PPSUB_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
-# 
-# # Force recompilation of ppSubVersion.c, since it gets the version information
-# ppSubVersion.c: FORCE
-#       touch ppSubVersion.c
-# FORCE: ;
+if HAVE_SVNVERSION
+PPSUB_VERSION=`$(SVNVERSION) ..`
+else
+PPSUB_VERSION="UNKNOWN"
+endif
 
-ppSub_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PPSTATS_CFLAGS) $(PSPHOT_CFLAGS) $(PPSUB_CFLAGS) -DPPSUB_VERSION=$(SVN_VERSION) -DPPSUB_BRANCH=$(SVN_BRANCH) -DPPSUB_SOURCE=$(SVN_SOURCE)
+if HAVE_SVN
+PPSUB_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 }'`
+PPSUB_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
+else
+PPSUB_BRANCH="UNKNOWN"
+PPSUB_SOURCE="UNKNOWN"
+endif
+
+# Force recompilation of ppSubVersion.c, since it gets the version information
+ppSubVersion.c: ppSubVersionDefinitions.h
+ppSubVersionDefinitions.h: ppSubVersionDefinitions.h.in FORCE
+        -$(RM) ppSubVersionDefinitions.h
+        $(SED) -e "s|@PPSUB_VERSION@|\"$(PPSUB_VERSION)\"|" -e "s|@PPSUB_BRANCH@|\"$(PPSUB_BRANCH)\"|" -e "s|@PPSUB_SOURCE@|\"$(PPSUB_SOURCE)\"|" ppSubVersionDefinitions.h.in > ppSubVersionDefinitions.h
+FORCE: ;
+
+ppSub_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PPSTATS_CFLAGS) $(PSPHOT_CFLAGS) $(PPSUB_CFLAGS)
 ppSub_LDFLAGS  = $(PSLIB_LIBS)   $(PSMODULE_LIBS)   $(PPSTATS_LIBS)   $(PSPHOT_LIBS)   $(PPSUB_LIBS)
 
-ppSub_SOURCES =                  \
-        ppSub.c                  \
-        ppSubArguments.c         \
-        ppSubVersion.c           \
-        ppSubBackground.c        \
-        ppSubCamera.c            \
-        ppSubLoop.c              \
-        ppSubReadout.c           \
-        ppSubDefineOutput.c      \
-        ppSubExtras.c            \
-        ppSubMakePSF.c           \
-        ppSubMatchPSFs.c         \
-        ppSubReadoutPhotometry.c \
-        ppSubReadoutSubtract.c   \
-        ppSubReadoutUpdate.c     \
-        ppSubSetMasks.c          \
-        ppSubReadoutRenorm.c     \
-        ppSubVarianceFactors.c
+ppSub_SOURCES =                         \
+        ppSub.c                         \
+        ppSubArguments.c                \
+        ppSubVersion.c                  \
+        ppSubBackground.c               \
+        ppSubCamera.c                   \
+        ppSubData.c                     \
+        ppSubErrorCodes.c               \
+        ppSubFiles.c                    \
+        ppSubLoop.c                     \
+        ppSubDefineOutput.c             \
+        ppSubExtras.c                   \
+        ppSubMakePSF.c                  \
+        ppSubMatchPSFs.c                \
+        ppSubReadoutInverse.c           \
+        ppSubReadoutJpeg.c              \
+        ppSubReadoutPhotometry.c        \
+        ppSubReadoutStats.c             \
+        ppSubReadoutSubtract.c          \
+        ppSubSetMasks.c
 
 ppSubKernel_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PPSUB_CFLAGS)
@@ -41 +55 @@
         ppSub.h
 
+
+### Error codes.
+BUILT_SOURCES = ppSubErrorCodes.h ppSubErrorCodes.c
+CLEANFILES = ppSubErrorCodes.h ppSubErrorCodes.c
+
+ppSubErrorCodes.h : ppSubErrorCodes.dat ppSubErrorCodes.h.in
+        $(ERRORCODES) --data=ppSubErrorCodes.dat --outdir=. ppSubErrorCodes.h
+
+ppSubErrorCodes.c : ppSubErrorCodes.dat ppSubErrorCodes.c.in ppSubErrorCodes.h
+        $(ERRORCODES) --data=ppSubErrorCodes.dat --outdir=. ppSubErrorCodes.c
+
+
 clean-local:
         -rm -f TAGS
@@ -47 +73 @@
 tags:
         etags `find . -name \*.[ch] -print`
-

@@ -10 +10 @@
 stamp-h1
 ppSubKernel
+ppSubErrorCodes.h
+ppSubErrorCodes.c
+ppSubVersionDefinitions.h