Changeset 13458

Timestamp:

May 21, 2007, 6:15:26 PM (19 years ago)

Author:

Paul Price

Message:

Adapting code to use the pmFPAfile support, to reflect the organisation of the other programs, and use pmStack instead of pmImageCombine. Note that this version requires some code not yet checked in to psModules, to support multiple input files of the same name. This hasn't been checked yet.

Location:

trunk/ppStac

Files:

• Makefile.am (modified) (1 diff)
• autogen.sh (modified) (1 diff)
• configure.ac (modified) (3 diffs)
• src (modified) (1 prop)
• src/.cvsignore (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)
• src/ppStac.c (deleted)
• src/ppStac.h (deleted)
• src/ppStacCombine.c (deleted)
• src/ppStacErrorCodes.c.in (deleted)
• src/ppStacErrorCodes.dat (deleted)
• src/ppStacErrorCodes.h.in (deleted)
• src/ppStack.c (added)
• src/ppStack.h (added)
• src/ppStackArguments.c (added)
• src/ppStackCamera.c (added)
• src/ppStackLoop.c (added)
• src/ppStackReadout.c (added)
• src/ppStackVersion.c (added)

trunk/ppStac/Makefile.am

@@ -2 +2 @@
 
 CLEANFILES = *~ core core.*
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA= ppStac.pc
-
-EXTRA_DIST = \
-        ppStac.pc.in

trunk/ppStac/autogen.sh

@@ -8 +8 @@
 cd $srcdir
 
-PROJECT=ppStac
+PROJECT=ppStack
 TEST_TYPE=-f
 # change this to be a unique filename in the top level dir

trunk/ppStac/configure.ac

@@ -1 +1 @@
 AC_PREREQ(2.59)
 
-AC_INIT([ppStac], [0.1.1], [ipp-support@ifa.hawaii.edu])
+AC_INIT([ppStack], [0.1.1], [ipp-support@ifa.hawaii.edu])
 AC_CONFIG_SRCDIR([src])
 
@@ -12 +12 @@
 AC_LANG(C)
 AC_GNU_SOURCE
-AC_PROG_CC
+AC_PROG_CC_C99
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
@@ -19 +19 @@
 PKG_CHECK_MODULES([PSLIB], [pslib >= 1.0.0])
 PKG_CHECK_MODULES([PSMODULE], [psmodules >= 1.0.0])
+PKG_CHECK_MODULES([PPSTATS], [ppStats >= 1.0.0]) 
 
 IPP_STDOPTS
-CFLAGS="${CFLAGS=} -Wall -Werror -std=c99"
+CFLAGS="${CFLAGS=} -Wall -Werror"
+
+AC_SUBST([PPSTACK_CFLAGS])
+AC_SUBST([PPSTACK_LIBS])
 
 AC_CONFIG_FILES([
   Makefile
   src/Makefile
-  ppStac.pc
 ])
 AC_OUTPUT

trunk/ppStac/src

@@ -5 +5 @@
 *.lo
 *.la
-ppStac
+ppStack
 config.h
 config.h.in

@@ -5 +5 @@
 *.lo
 *.la
-ppStac
+ppStack
 config.h
 config.h.in

trunk/ppStac/src/.cvsignore

@@ -5 +5 @@
 *.lo
 *.la
-ppStac
+ppStack
 config.h
 config.h.in

trunk/ppStac/src/Makefile.am

@@ -1 @@
-bin_PROGRAMS = ppStac
+bin_PROGRAMS = ppStack
 
-ppStac_CFLAGS   = $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
-ppStac_LDFLAGS = $(PSMODULE_LIBS) $(PSLIB_LIBS)
+ppStack_CFLAGS  = $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) $(PPSTATS_CFLAGS)$(PPSTACK_CFLAGS)
+ppStack_LDFLAGS = $(PSMODULE_LIBS) $(PSLIB_LIBS) $(PPSTATS_LIBS) $(PPSTACK_LIBS)
 
-ppStac_SOURCES =                \
-        ppStac.c                \
-        ppStacOptions.c         \
-        ppStacCombine.c
+ppStack_SOURCES =               \
+        ppStack.c               \
+        ppStackArguments.c      \
+        ppStackCamera.c         \
+        ppStackLoop.c           \
+        ppStackReadout.c        \
+        ppStackVersion.c
 
 noinst_HEADERS =                \
-        ppStac.h
+        ppStack.h
 
 CLEANFILES = *~

@@ -5 +5 @@
 *.lo
 *.la
-ppStac
+ppStack
 config.h
 config.h.in