Changeset 23352 for branches/cnb_branches/cnb_branch_20090301/ppStack/src/Makefile.am

Timestamp:

Mar 17, 2009, 12:08:50 PM (17 years ago)

Author:

beaumont

Message:

merged with head

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

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

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

@@ -1 +1 @@
 bin_PROGRAMS = ppStack
 
-ppStack_CFLAGS  = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSPHOT_CFLAGS) $(PPSTATS_CFLAGS) $(PPSTACK_CFLAGS)
+# PPSTACK_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
+# PPSTACK_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`
+# PPSTACK_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
+# 
+# # Force recompilation of ppStackVersion.c, since it gets the version information
+# ppStackVersion.c: FORCE
+#       touch ppStackVersion.c
+# FORCE: ;
+
+ppStack_CFLAGS  = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSPHOT_CFLAGS) $(PPSTATS_CFLAGS) $(PPSTACK_CFLAGS) -DPPSTACK_VERSION=$(SVN_VERSION) -DPPSTACK_BRANCH=$(SVN_BRANCH) -DPPSTACK_SOURCE=$(SVN_SOURCE)
 ppStack_LDFLAGS = $(PSLIB_LIBS)   $(PSMODULE_LIBS)   $(PSPHOT_LIBS)   $(PPSTATS_LIBS)   $(PPSTACK_LIBS)
 
@@ -8 +17 @@
         ppStackArguments.c      \
         ppStackCamera.c         \
+        ppStackFiles.c          \
         ppStackLoop.c           \
         ppStackPSF.c            \
         ppStackReadout.c        \
-        ppStackPhotometry.c     \
         ppStackVersion.c        \
         ppStackMatch.c          \
         ppStackSources.c        \
-        ppStackThread.c
+        ppStackThread.c         \
+        ppStackOptions.c        \
+        ppStackSetup.c          \
+        ppStackPrepare.c        \
+        ppStackConvolve.c       \
+        ppStackCombineInitial.c \
+        ppStackReject.c         \
+        ppStackCombineFinal.c   \
+        ppStackCleanup.c        \
+        ppStackPhotometry.c     \
+        ppStackFinish.c
 
 noinst_HEADERS =                \
-        ppStack.h
+        ppStack.h               \
+        ppStackLoop.h           \
+        ppStackOptions.h        \
+        ppStackThread.h
 
 CLEANFILES = *~