Index: /trunk/psModules/Doxyfile.in
===================================================================
--- /trunk/psModules/Doxyfile.in	(revision 8568)
+++ /trunk/psModules/Doxyfile.in	(revision 8569)
@@ -31,5 +31,5 @@
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = @prefix@/docs/psmodule
+OUTPUT_DIRECTORY       = @prefix@/docs/psmodules
 
 # The OUTPUT_LANGUAGE tag is used to specify the language in which all
Index: /trunk/psModules/Makefile.am
===================================================================
--- /trunk/psModules/Makefile.am	(revision 8568)
+++ /trunk/psModules/Makefile.am	(revision 8569)
@@ -1,24 +1,24 @@
 SUBDIRS = src test
 
-bin_SCRIPTS = psmodule-config
+bin_SCRIPTS = psmodules-config
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA= psmodule.pc
+pkgconfig_DATA= psmodules.pc
 
 EXTRA_DIST = \
 	Doxyfile.in \
-	psmodule-config.in \
-	psmodule.pc.in \
+	psmodules-config.in \
+	psmodules.pc.in \
 	autogen.sh
 
 if DOXYGEN
 
-docs: Doxyfile $(prefix)/docs/psmodule $(mandir)/man3
+docs: Doxyfile $(prefix)/docs/psmodules $(mandir)/man3
 	doxygen Doxyfile
-	mv -f $(prefix)/docs/psmodule/man/man3/* $(mandir)/man3
-	rm -rf $(prefix)/docs/psmodule/man
+	mv -f $(prefix)/docs/psmodules/man/man3/* $(mandir)/man3
+	rm -rf $(prefix)/docs/psmodules/man
 
-$(prefix)/docs/psmodule:
-	mkdir -p $(prefix)/docs/psmodule
+$(prefix)/docs/psmodules:
+	mkdir -p $(prefix)/docs/psmodules
 
 $(mandir)/man3:
@@ -26,7 +26,7 @@
 
 uninstall-hook:
-	rm -rf $(prefix)/docs/psmodule/*
+	rm -rf $(prefix)/docs/psmodules/*
 
-CLEANFILES = $(prefix)/docs/psmodule/* *~
+CLEANFILES = $(prefix)/docs/psmodules/* *~
 
 endif
Index: /trunk/psModules/autogen.sh
===================================================================
--- /trunk/psModules/autogen.sh	(revision 8568)
+++ /trunk/psModules/autogen.sh	(revision 8569)
@@ -8,7 +8,7 @@
 cd $srcdir
 
-PROJECT=psmodule
+PROJECT=psmodules
 TEST_TYPE=-f
-FILE=psmodule.pc.in
+FILE=psmodules.pc.in
 
 DIE=0
Index: /trunk/psModules/configure.ac
===================================================================
--- /trunk/psModules/configure.ac	(revision 8568)
+++ /trunk/psModules/configure.ac	(revision 8569)
@@ -1,6 +1,6 @@
 AC_PREREQ(2.59)
 
-AC_INIT([psmodule],[0.12.99],[http://pan-starrs.ifa.hawaii.edu/bugzilla])
-AC_CONFIG_SRCDIR([psmodule.pc.in])
+AC_INIT([psmodules],[0.12.99],[http://pan-starrs.ifa.hawaii.edu/bugzilla])
+AC_CONFIG_SRCDIR([psmodules.pc.in])
 
 AM_INIT_AUTOMAKE([1.7 foreign dist-bzip2])
@@ -53,5 +53,5 @@
 SRCINC=`echo "${SRCDIRS=}" | ${PERL} -pe "s|(\w+)|-I\\\\${SRCPATH=}/\1|g"`
 SRCINC="-I${SRCPATH=} ${SRCINC=}"
-SRCSUBLIBS=`echo "${SRCDIRS=}" | ${PERL} -pe "s|(\w+)|\1/libpsmodule\1.la|g"`
+SRCSUBLIBS=`echo "${SRCDIRS=}" | ${PERL} -pe "s|(\w+)|\1/libpsmodules\1.la|g"`
 AC_SUBST(SRCSUBLIBS,${SRCSUBLIBS=})
 AC_SUBST(SRCINC,${SRCINC=})
@@ -107,10 +107,10 @@
 fi
 
-PSMODULE_CFLAGS="${PSMODULE_CFLAGS=} ${PSLIB_CFLAGS}"
-PSMODULE_LIBS="${PSMODULE_LIBS=} ${PSLIB_LIBS}"
+PSMODULES_CFLAGS="${PSMODULES_CFLAGS=} ${PSLIB_CFLAGS}"
+PSMODULES_LIBS="${PSMODULES_LIBS=} ${PSLIB_LIBS}"
 dnl ---------------------------------------------------------------------------
 
-AC_SUBST([PSMODULE_CFLAGS])
-AC_SUBST([PSMODULE_LIBS])
+AC_SUBST([PSMODULES_CFLAGS])
+AC_SUBST([PSMODULES_LIBS])
 
 AC_CONFIG_FILES([
@@ -133,6 +133,6 @@
   test/objects/Makefile
   Doxyfile
-  psmodule-config
-  psmodule.pc
+  psmodules-config
+  psmodules.pc
 ])
 
Index: unk/psModules/psmodule-config.in
===================================================================
--- /trunk/psModules/psmodule-config.in	(revision 8568)
+++ 	(revision )
@@ -1,76 +1,0 @@
-#! /bin/sh
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-usage()
-{
-    cat <<EOF
-Usage: pslib-config [OPTION]
-
-Known values for OPTION are:
-
-  --prefix		print psLib installation prefix
-  --libs		print library linking information
-  --cflags		print pre-processor and compiler flags
-  --help		display this help and exit
-  --version		output version information
-
-EOF
-
-    exit $1
-}
-
-if test $# -eq 0; then
-    usage 1
-fi
-
-cflags=false
-libs=false
-
-while test $# -gt 0; do
-    case "$1" in
-    -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-    *) optarg= ;;
-    esac
-
-    case "$1" in
-    --prefix=*)
-	prefix=$optarg
-	;;
-
-    --prefix)
-	echo $prefix
-	;;
-
-    --version)
-	echo @VERSION@
-	exit 0
-	;;
-
-    --help)
-	usage 0
-	;;
-
-    --cflags)
-       	echo -I${includedir} @PSMODULE_CFLAGS@
-       	;;
-
-    --libs)
-       	echo -L${libdir} -lpsmodule @PSMODULE_LIBS@
-       	;;
-
-    --deps)
-       	echo @LDFLAGS@
-       	;;
-    *)
-	usage
-	exit 1
-	;;
-    esac
-    shift
-done
-
-exit 0
Index: unk/psModules/psmodule.pc.in
===================================================================
--- /trunk/psModules/psmodule.pc.in	(revision 8568)
+++ 	(revision )
@@ -1,10 +1,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: psmodule
-Description: Pan-STARRS Module Library
-Version: @VERSION@
-Libs: -L${libdir} -lpsmodule @PSMODULE_LIBS@
-Cflags: -I${includedir} @PSMODULE_CFLAGS@
Index: /trunk/psModules/psmodules-config.in
===================================================================
--- /trunk/psModules/psmodules-config.in	(revision 8569)
+++ /trunk/psModules/psmodules-config.in	(revision 8569)
@@ -0,0 +1,76 @@
+#! /bin/sh
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+usage()
+{
+    cat <<EOF
+Usage: pslib-config [OPTION]
+
+Known values for OPTION are:
+
+  --prefix		print psLib installation prefix
+  --libs		print library linking information
+  --cflags		print pre-processor and compiler flags
+  --help		display this help and exit
+  --version		output version information
+
+EOF
+
+    exit $1
+}
+
+if test $# -eq 0; then
+    usage 1
+fi
+
+cflags=false
+libs=false
+
+while test $# -gt 0; do
+    case "$1" in
+    -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+    *) optarg= ;;
+    esac
+
+    case "$1" in
+    --prefix=*)
+	prefix=$optarg
+	;;
+
+    --prefix)
+	echo $prefix
+	;;
+
+    --version)
+	echo @VERSION@
+	exit 0
+	;;
+
+    --help)
+	usage 0
+	;;
+
+    --cflags)
+       	echo -I${includedir} @PSMODULE_CFLAGS@
+       	;;
+
+    --libs)
+       	echo -L${libdir} -lpsmodule @PSMODULE_LIBS@
+       	;;
+
+    --deps)
+       	echo @LDFLAGS@
+       	;;
+    *)
+	usage
+	exit 1
+	;;
+    esac
+    shift
+done
+
+exit 0
Index: /trunk/psModules/psmodules.pc.in
===================================================================
--- /trunk/psModules/psmodules.pc.in	(revision 8569)
+++ /trunk/psModules/psmodules.pc.in	(revision 8569)
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: psmodule
+Description: Pan-STARRS Module Library
+Version: @VERSION@
+Libs: -L${libdir} -lpsmodule @PSMODULE_LIBS@
+Cflags: -I${includedir} @PSMODULE_CFLAGS@
Index: /trunk/psModules/src/Makefile.am
===================================================================
--- /trunk/psModules/src/Makefile.am	(revision 8568)
+++ /trunk/psModules/src/Makefile.am	(revision 8569)
@@ -1,9 +1,9 @@
 SUBDIRS = $(SRCDIRS)
-lib_LTLIBRARIES = libpsmodule.la
+lib_LTLIBRARIES = libpsmodules.la
 
-libpsmodule_la_SOURCES = dummy.c
-libpsmodule_la_CPPFLAGS = $(SRCINC)
-libpsmodule_la_LIBADD = $(SRCSUBLIBS)
-libpsmodule_la_DEPENDENCIES = $(SRCSUBLIBS)
+libpsmodules_la_SOURCES = dummy.c
+libpsmodules_la_CPPFLAGS = $(SRCINC)
+libpsmodules_la_LIBADD = $(SRCSUBLIBS)
+libpsmodules_la_DEPENDENCIES = $(SRCSUBLIBS)
 
 include_HEADERS = \
Index: /trunk/psModules/src/astrom/Makefile.am
===================================================================
--- /trunk/psModules/src/astrom/Makefile.am	(revision 8568)
+++ /trunk/psModules/src/astrom/Makefile.am	(revision 8569)
@@ -1,12 +1,12 @@
-noinst_LTLIBRARIES = libpsmoduleastrom.la
+noinst_LTLIBRARIES = libpsmodulesastrom.la
 
-libpsmoduleastrom_la_CPPFLAGS = $(SRCINC) $(PSMODULE_CFLAGS) -I../pslib/
-libpsmoduleastrom_la_LDFLAGS  = -release $(PACKAGE_VERSION)
-libpsmoduleastrom_la_SOURCES  = \
+libpsmodulesastrom_la_CPPFLAGS = $(SRCINC) $(PSMODULES_CFLAGS) -I../pslib/
+libpsmodulesastrom_la_LDFLAGS  = -release $(PACKAGE_VERSION)
+libpsmodulesastrom_la_SOURCES  = \
 	pmAstrometryObjects.c \
 	pmAstrometryDistortion.c
 
-psmoduleincludedir = $(includedir)
-psmoduleinclude_HEADERS = \
+psmodulesincludedir = $(includedir)
+psmodulesinclude_HEADERS = \
 	pmAstrometryObjects.h \
 	pmAstrometryDistortion.h
Index: /trunk/psModules/src/camera/Makefile.am
===================================================================
--- /trunk/psModules/src/camera/Makefile.am	(revision 8568)
+++ /trunk/psModules/src/camera/Makefile.am	(revision 8569)
@@ -1,7 +1,7 @@
-noinst_LTLIBRARIES = libpsmodulecamera.la
+noinst_LTLIBRARIES = libpsmodulescamera.la
 
-libpsmodulecamera_la_CPPFLAGS = $(SRCINC) $(PSMODULE_CFLAGS)
-libpsmodulecamera_la_LDFLAGS  = -release $(PACKAGE_VERSION)
-libpsmodulecamera_la_SOURCES  = \
+libpsmodulescamera_la_CPPFLAGS = $(SRCINC) $(PSMODULES_CFLAGS)
+libpsmodulescamera_la_LDFLAGS  = -release $(PACKAGE_VERSION)
+libpsmodulescamera_la_SOURCES  = \
 	pmFPA.c \
 	pmFPAConstruct.c \
@@ -23,6 +23,6 @@
 	pmFPAfileFitsIO.c
 
-psmoduleincludedir = $(includedir)
-psmoduleinclude_HEADERS = \
+psmodulesincludedir = $(includedir)
+psmodulesinclude_HEADERS = \
 	pmFPA.h \
 	pmFPAConstruct.h \
Index: /trunk/psModules/src/concepts/Makefile.am
===================================================================
--- /trunk/psModules/src/concepts/Makefile.am	(revision 8568)
+++ /trunk/psModules/src/concepts/Makefile.am	(revision 8569)
@@ -1,7 +1,7 @@
-noinst_LTLIBRARIES = libpsmoduleconcepts.la
+noinst_LTLIBRARIES = libpsmodulesconcepts.la
 
-libpsmoduleconcepts_la_CPPFLAGS = $(SRCINC) $(PSMODULE_CFLAGS)
-libpsmoduleconcepts_la_LDFLAGS  = -release $(PACKAGE_VERSION)
-libpsmoduleconcepts_la_SOURCES  = \
+libpsmodulesconcepts_la_CPPFLAGS = $(SRCINC) $(PSMODULES_CFLAGS)
+libpsmodulesconcepts_la_LDFLAGS  = -release $(PACKAGE_VERSION)
+libpsmodulesconcepts_la_SOURCES  = \
 	pmConcepts.c \
 	pmConceptsAverage.c \
@@ -11,6 +11,6 @@
 	pmConceptsPhotcode.c
 
-psmoduleincludedir = $(includedir)
-psmoduleinclude_HEADERS = \
+psmodulesincludedir = $(includedir)
+psmodulesinclude_HEADERS = \
 	pmConcepts.h \
 	pmConceptsAverage.h \
Index: /trunk/psModules/src/config/Makefile.am
===================================================================
--- /trunk/psModules/src/config/Makefile.am	(revision 8568)
+++ /trunk/psModules/src/config/Makefile.am	(revision 8569)
@@ -1,11 +1,11 @@
-noinst_LTLIBRARIES = libpsmoduleconfig.la
+noinst_LTLIBRARIES = libpsmodulesconfig.la
 
-libpsmoduleconfig_la_CPPFLAGS = $(SRCINC) $(PSMODULE_CFLAGS)
-libpsmoduleconfig_la_LDFLAGS  = -release $(PACKAGE_VERSION)
-libpsmoduleconfig_la_SOURCES  = \
+libpsmodulesconfig_la_CPPFLAGS = $(SRCINC) $(PSMODULES_CFLAGS)
+libpsmodulesconfig_la_LDFLAGS  = -release $(PACKAGE_VERSION)
+libpsmodulesconfig_la_SOURCES  = \
     pmConfig.c
 
-psmoduleincludedir = $(includedir)
-psmoduleinclude_HEADERS = \
+psmodulesincludedir = $(includedir)
+psmodulesinclude_HEADERS = \
     pmConfig.h
 
Index: /trunk/psModules/src/detrend/Makefile.am
===================================================================
--- /trunk/psModules/src/detrend/Makefile.am	(revision 8568)
+++ /trunk/psModules/src/detrend/Makefile.am	(revision 8569)
@@ -1,7 +1,7 @@
-noinst_LTLIBRARIES = libpsmoduledetrend.la
+noinst_LTLIBRARIES = libpsmodulesdetrend.la
 
-libpsmoduledetrend_la_CPPFLAGS = $(SRCINC) $(PSMODULE_CFLAGS)
-libpsmoduledetrend_la_LDFLAGS  = -release $(PACKAGE_VERSION)
-libpsmoduledetrend_la_SOURCES  = \
+libpsmodulesdetrend_la_CPPFLAGS = $(SRCINC) $(PSMODULES_CFLAGS)
+libpsmodulesdetrend_la_LDFLAGS  = -release $(PACKAGE_VERSION)
+libpsmodulesdetrend_la_SOURCES  = \
 	pmFlatField.c \
 	pmFlatNormalize.c \
@@ -16,6 +16,6 @@
 #	pmSubtractSky.c
 
-psmoduleincludedir = $(includedir)
-psmoduleinclude_HEADERS = \
+psmodulesincludedir = $(includedir)
+psmodulesinclude_HEADERS = \
 	pmFlatField.h \
 	pmFlatFieldErrors.h \
Index: /trunk/psModules/src/imcombine/Makefile.am
===================================================================
--- /trunk/psModules/src/imcombine/Makefile.am	(revision 8568)
+++ /trunk/psModules/src/imcombine/Makefile.am	(revision 8569)
@@ -1,14 +1,14 @@
-noinst_LTLIBRARIES = libpsmoduleimcombine.la
+noinst_LTLIBRARIES = libpsmodulesimcombine.la
 
-libpsmoduleimcombine_la_CPPFLAGS = $(SRCINC) $(PSMODULE_CFLAGS)
-libpsmoduleimcombine_la_LDFLAGS  = -release $(PACKAGE_VERSION)
+libpsmodulesimcombine_la_CPPFLAGS = $(SRCINC) $(PSMODULES_CFLAGS)
+libpsmodulesimcombine_la_LDFLAGS  = -release $(PACKAGE_VERSION)
 
-libpsmoduleimcombine_la_SOURCES  = \
+libpsmodulesimcombine_la_SOURCES  = \
      pmImageCombine.c \
      pmImageSubtract.c \
      pmReadoutCombine.c
 
-psmoduleincludedir = $(includedir)
-psmoduleinclude_HEADERS = \
+psmodulesincludedir = $(includedir)
+psmodulesinclude_HEADERS = \
     pmImageCombine.h \
     pmImageSubtract.h \
Index: /trunk/psModules/src/mainpage.dox
===================================================================
--- /trunk/psModules/src/mainpage.dox	(revision 8568)
+++ /trunk/psModules/src/mainpage.dox	(revision 8569)
@@ -1,7 +1,7 @@
-/** @mainpage psModule Image Processing Library
+/** @mainpage psModules Image Processing Library
 
 
 @section intro Introduction
-This library contains the Pan-STARRS Image Processing Pipeline (IPP) modules (psModule). These modules
+This library contains the Pan-STARRS Image Processing Pipeline (IPP) modules (psModules). These modules
 use the functionality of the Pan-STARRS Library (psLib) to perform more complex tasks associated with image
 processing. Modules were constructed to support each of the required processing stages and are listed according
@@ -9,5 +9,5 @@
 structures and functions are prefixed with pm, an abbreviation for Pan-STARRS Modules.
 
-The capabilities provided by psModule are grouped into the following areas which are
+The capabilities provided by psModules are grouped into the following areas which are
 also reflected in the file system directory structure:
  - Configuration
@@ -19,5 +19,5 @@
  - Image Subtraction
 
-The installed code for psModule consists of header files and a binary library.
+The installed code for psModules consists of header files and a binary library.
 
 @section extinstall Required external Libraries
@@ -37,5 +37,5 @@
 We recommend using the particular versions listed as compatibility tested, as
 that is the only versions of the external libraries tested to work well with psLib
-and psModule.  Though it is quite possible that later versions of the libraries
+and psModules.  Though it is quite possible that later versions of the libraries
 listed will also work, care must be taken when upgrading these libraries to verify
 that its functionality is compatible with the tested version.
@@ -43,5 +43,5 @@
 @section install How to Build from Source
 
-Tested versions of psModule are put into a tar file and can be downloaded from:
+Tested versions of psModules are put into a tar file and can be downloaded from:
 
 https://mhpcc.pan-starrs.org/code/releases
@@ -58,12 +58,12 @@
 
 
-@section build How to Build and Test the psModule Library.
+@section build How to Build and Test the psModules Library.
 
-The psModule library and associated tests are made via the GNU autoconf/automake system.
+The psModules library and associated tests are made via the GNU autoconf/automake system.
 
-The source should build using the configure script in the psModule directory.  The
+The source should build using the configure script in the psModules directory.  The
 recommended steps are:
 <pre>
-$ cd psModule
+$ cd psmodules
 $ ./configure
 $ make
@@ -77,5 +77,5 @@
 
 Other configuration options, such as location of external libraries, are also available.
-To get a list of options, type the following in the top psModule directory.
+To get a list of options, type the following in the top psModules directory.
 <pre>
 $ configure --help
@@ -94,19 +94,19 @@
 
 
-@section usage Building and Linking your code to the psModule library
+@section usage Building and Linking your code to the psModules library
 
 To assist the use of the library with your own code, a configuration tool is part
-of the psModule library package.  This tool, psmodule-config, is installed in the BIN
+of the psModules library package.  This tool, psmodules-config, is installed in the BIN
 directory, according to the options given to the configure script.
 
-The required CFLAG options for the compiler stage of code that uses psModule can be
-obtained via 'psmodule-config --cflags'.  This outputs the cc options that supplies
-include path(s) required to find the psModule headers.
+The required CFLAG options for the compiler stage of code that uses psModules can be
+obtained via 'psmodules-config --cflags'.  This outputs the cc options that supplies
+include path(s) required to find the psModules headers.
 
-The required linking options, can be obtained via 'psmodule-config --libs'.  This
+The required linking options, can be obtained via 'psmodules-config --libs'.  This
 outputs the ld options that supplies the library paths and files required to
-link to the psModule library.
+link to the psModules library.
 
-Note: psmodule-config usage above refers to the install locations of the library.  
+Note: psmodules-config usage above refers to the install locations of the library.  
 
 @section doc How to Create Code Documentation
@@ -115,5 +115,5 @@
 documentation embedded in the code using the following commands:
 <pre>
-$ cd psModule
+$ cd psmodules
 $ make docs
 </pre>
Index: /trunk/psModules/src/objects/Makefile.am
===================================================================
--- /trunk/psModules/src/objects/Makefile.am	(revision 8568)
+++ /trunk/psModules/src/objects/Makefile.am	(revision 8569)
@@ -1,7 +1,7 @@
-noinst_LTLIBRARIES = libpsmoduleobjects.la
+noinst_LTLIBRARIES = libpsmodulesobjects.la
 
-libpsmoduleobjects_la_CPPFLAGS = $(SRCINC) $(PSMODULE_CFLAGS) -I../pslib/
-libpsmoduleobjects_la_LDFLAGS  = -release $(PACKAGE_VERSION)
-libpsmoduleobjects_la_SOURCES  = \
+libpsmodulesobjects_la_CPPFLAGS = $(SRCINC) $(PSMODULES_CFLAGS) -I../pslib/
+libpsmodulesobjects_la_LDFLAGS  = -release $(PACKAGE_VERSION)
+libpsmodulesobjects_la_SOURCES  = \
      pmPeaks.c \
      pmMoments.c \
@@ -30,6 +30,6 @@
 	models/pmModel_SGAUSS.c 
 
-psmoduleincludedir = $(includedir)
-psmoduleinclude_HEADERS = \
+psmodulesincludedir = $(includedir)
+psmodulesinclude_HEADERS = \
      pmPeaks.h \
      pmMoments.h \
Index: /trunk/psModules/test/Makefile.am
===================================================================
--- /trunk/psModules/test/Makefile.am	(revision 8568)
+++ /trunk/psModules/test/Makefile.am	(revision 8569)
@@ -1,4 +1,2 @@
-# Makefile for psModule tests
-
 SUBDIRS = $(SRCDIRS)
 
Index: /trunk/psModules/test/astrom/Makefile.am
===================================================================
--- /trunk/psModules/test/astrom/Makefile.am	(revision 8568)
+++ /trunk/psModules/test/astrom/Makefile.am	(revision 8569)
@@ -1,6 +1,4 @@
-# Makefile for psModule tests
-
-AM_LDFLAGS = -L$(top_builddir)/src -lpsmodule $(PSMODULE_LIBS)
-AM_CFLAGS  = @AM_CFLAGS@ $(PSMODULE_CFLAGS) $(SRCINC)
+AM_LDFLAGS = -L$(top_builddir)/src -lpsmodules $(PSMODULES_LIBS)
+AM_CFLAGS  = @AM_CFLAGS@ $(PSMODULES_CFLAGS) $(SRCINC)
 AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS)
 
Index: /trunk/psModules/test/camera/Makefile.am
===================================================================
--- /trunk/psModules/test/camera/Makefile.am	(revision 8568)
+++ /trunk/psModules/test/camera/Makefile.am	(revision 8569)
@@ -1,6 +1,4 @@
-# Makefile for psModule tests
-
-AM_LDFLAGS = -L$(top_builddir)/src -lpsmodule $(PSMODULE_LIBS)
-AM_CFLAGS  = @AM_CFLAGS@ $(PSMODULE_CFLAGS) $(SRCINC)
+AM_LDFLAGS = -L$(top_builddir)/src -lpsmodules $(PSMODULES_LIBS)
+AM_CFLAGS  = @AM_CFLAGS@ $(PSMODULES_CFLAGS) $(SRCINC)
 AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS)
 
Index: /trunk/psModules/test/concepts/Makefile.am
===================================================================
--- /trunk/psModules/test/concepts/Makefile.am	(revision 8568)
+++ /trunk/psModules/test/concepts/Makefile.am	(revision 8569)
@@ -1,6 +1,4 @@
-# Makefile for psModule tests
-
-AM_LDFLAGS = -L$(top_builddir)/src -lpsmodule $(PSMODULE_LIBS)
-AM_CFLAGS  = @AM_CFLAGS@ $(PSMODULE_CFLAGS) $(SRCINC)
+AM_LDFLAGS = -L$(top_builddir)/src -lpsmodules $(PSMODULES_LIBS)
+AM_CFLAGS  = @AM_CFLAGS@ $(PSMODULES_CFLAGS) $(SRCINC)
 AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS)
 
Index: /trunk/psModules/test/config/Makefile.am
===================================================================
--- /trunk/psModules/test/config/Makefile.am	(revision 8568)
+++ /trunk/psModules/test/config/Makefile.am	(revision 8569)
@@ -1,6 +1,4 @@
-# Makefile for psModule tests
-
-AM_LDFLAGS = -L$(top_builddir)/src -lpsmodule $(PSMODULE_LIBS)
-AM_CFLAGS  = @AM_CFLAGS@ $(PSMODULE_CFLAGS) $(SRCINC)
+AM_LDFLAGS = -L$(top_builddir)/src -lpsmodules $(PSMODULES_LIBS)
+AM_CFLAGS  = @AM_CFLAGS@ $(PSMODULES_CFLAGS) $(SRCINC)
 
 TESTS = \
Index: /trunk/psModules/test/detrend/Makefile.am
===================================================================
--- /trunk/psModules/test/detrend/Makefile.am	(revision 8568)
+++ /trunk/psModules/test/detrend/Makefile.am	(revision 8569)
@@ -1,6 +1,4 @@
-# Makefile for psModule tests
-
-AM_LDFLAGS = -L$(top_builddir)/src -lpsmodule $(PSMODULE_LIBS)
-AM_CFLAGS  = @AM_CFLAGS@ $(PSMODULE_CFLAGS) $(SRCINC)
+AM_LDFLAGS = -L$(top_builddir)/src -lpsmodules $(PSMODULES_LIBS)
+AM_CFLAGS  = @AM_CFLAGS@ $(PSMODULES_CFLAGS) $(SRCINC)
 AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS)
 
Index: /trunk/psModules/test/imcombine/Makefile.am
===================================================================
--- /trunk/psModules/test/imcombine/Makefile.am	(revision 8568)
+++ /trunk/psModules/test/imcombine/Makefile.am	(revision 8569)
@@ -1,6 +1,4 @@
-# Makefile for psModule tests
-
-AM_LDFLAGS = -L$(top_builddir)/src -lpsmodule $(PSMODULE_LIBS)
-AM_CFLAGS  = @AM_CFLAGS@ $(PSMODULE_CFLAGS) $(SRCINC)
+AM_LDFLAGS = -L$(top_builddir)/src -lpsmodules $(PSMODULES_LIBS)
+AM_CFLAGS  = @AM_CFLAGS@ $(PSMODULES_CFLAGS) $(SRCINC)
 
 TESTS = \
Index: /trunk/psModules/test/objects/Makefile.am
===================================================================
--- /trunk/psModules/test/objects/Makefile.am	(revision 8568)
+++ /trunk/psModules/test/objects/Makefile.am	(revision 8569)
@@ -1,6 +1,4 @@
-# Makefile for psModule tests
-
-AM_LDFLAGS = -L$(top_builddir)/src -lpsmodule $(PSMODULE_LIBS)
-AM_CFLAGS  = @AM_CFLAGS@ $(PSMODULE_CFLAGS) $(SRCINC)
+AM_LDFLAGS = -L$(top_builddir)/src -lpsmodules $(PSMODULES_LIBS)
+AM_CFLAGS  = @AM_CFLAGS@ $(PSMODULES_CFLAGS) $(SRCINC)
 
 TESTS = \
Index: /trunk/psModules/test/pslib/Makefile.am
===================================================================
--- /trunk/psModules/test/pslib/Makefile.am	(revision 8568)
+++ /trunk/psModules/test/pslib/Makefile.am	(revision 8569)
@@ -1,6 +1,4 @@
-# Makefile for psModule tests
-
-AM_LDFLAGS = -L$(top_builddir)/src -lpsmodule $(PSMODULE_LIBS)
-AM_CFLAGS  = @AM_CFLAGS@ $(PSMODULE_CFLAGS) $(SRCINC)
+AM_LDFLAGS = -L$(top_builddir)/src -lpsmodules $(PSMODULES_LIBS)
+AM_CFLAGS  = @AM_CFLAGS@ $(PSMODULES_CFLAGS) $(SRCINC)
 
 TESTS =