Index: unk/ppMerge/Makefile
===================================================================
--- /trunk/ppMerge/Makefile	(revision 6903)
+++ 	(revision )
@@ -1,77 +1,0 @@
-default: ppMerge
-help:
-	@echo "USAGE: make ppimage"
-
-CC      =       gcc
-SRC     =       src
-BIN     =       bin
-
-DESTBIN =       $(HOME)/src/bin/$(ARCH)
-
-LPSLIB  :=      $(shell pslib-config --libs)
-IPSLIB  :=      $(shell pslib-config --cflags)
-
-LPSMOD  :=      $(shell psmodule-config --libs)
-IPSMOD  :=      $(shell psmodule-config --cflags)
-
-INCS	= 	$(IPSLIB) $(IPSMOD)
-LIBS	= 	$(LPSLIB) $(LPSMOD)
-CFLAGS	=	$(INCS) -std=c99 -Wall -Werror -g
-LFLAGS	=	$(LIBS) 
-
-PPIMAGE = \
-$(SRC)/ppMerge.$(ARCH).o \
-$(SRC)/ppMergeCell.$(ARCH).o \
-$(SRC)/ppMergeConfig.$(ARCH).o \
-$(SRC)/ppMergeLoadPixels.$(ARCH).o \
-$(SRC)/ppMergeLoop.$(ARCH).o \
-$(SRC)/ppMergeOptions.$(ARCH).o \
-$(SRC)/ppMergeOutput.$(ARCH).o \
-$(SRC)/ppMergeParseCamera.$(ARCH).o \
-$(SRC)/ppMergeParseDetrend.$(ARCH).o
-
-# $(SRC)/ppMergeOutput.$(ARCH).o \
-# $(SRC)/ppDetrendFlat.$(ARCH).o \
-
-ppMerge: $(BIN)/ppMerge.$(ARCH)
-$(BIN)/ppMerge.$(ARCH) : $(PPIMAGE)
-$(PPIMAGE) : $(SRC)/ppMerge.h
-
-INSTALL = ppMerge
-
-# dependancy rules for binary code #########################
-.PRECIOUS: %.$(ARCH).o
-.PRECIOUS: $(BIN)/%.$(ARCH)
-
-%.$(ARCH).o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
-
-$(BIN)/%.$(ARCH) : $(SRC)/%.$(ARCH).o
-	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN) || exit; fi
-	$(CC) $^ -o $@ $(LFLAGS) || exit
-	@echo "done with $@"
-
-$(DESTBIN)/%: $(BIN)/%.$(ARCH)
-	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN) || exit; fi
-	rm -f $(DESTBIN)/$* || exit
-	cp $(BIN)/$*.$(ARCH) $(DESTBIN)/$* || exit
-
-$(INSTALL): % : $(BIN)/%.$(ARCH)
-
-%.clean :
-	rm -f $(BIN)/$*.$(ARCH)
-	rm -f $(SRC)/*.$(ARCH).o
-
-%.install:
-	make $(DESTBIN)/$* || exit
-
-# utilities #################################################
-
-install:
-	for i in $(INSTALL); do make $$i.install || exit; done
-
-clean:	
-	rm -f $(BIN)/*.$(ARCH)
-	rm -f `find . -name "*.o"`
-	rm -f `find . -name "*~"`
-	rm -f `find . -name "#*"`
Index: /trunk/ppMerge/Makefile.am
===================================================================
--- /trunk/ppMerge/Makefile.am	(revision 6904)
+++ /trunk/ppMerge/Makefile.am	(revision 6904)
@@ -0,0 +1,3 @@
+SUBDIRS = src
+
+CLEANFILES = *~ core core.*
Index: /trunk/ppMerge/autogen.sh
===================================================================
--- /trunk/ppMerge/autogen.sh	(revision 6904)
+++ /trunk/ppMerge/autogen.sh	(revision 6904)
@@ -0,0 +1,103 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
+PROJECT=ppImage
+TEST_TYPE=-f
+# change this to be a unique filename in the top level dir
+FILE=autogen.sh
+
+DIE=0
+
+LIBTOOLIZE=libtoolize
+ACLOCAL=aclocal
+AUTOHEADER=autoheader
+AUTOMAKE=automake
+AUTOCONF=autoconf
+
+#($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 || {
+#        echo
+#        echo "You must have $LIBTOOlIZE installed to compile $PROJECT."
+#        echo "Download the appropriate package for your distribution,"
+#        echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/"
+#        DIE=1
+#}
+
+($ACLOCAL --version) < /dev/null > /dev/null 2>&1 || {
+        echo
+        echo "You must have $ACLOCAL installed to compile $PROJECT."
+        echo "Download the appropriate package for your distribution,"
+        echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
+        DIE=1
+}
+
+#($AUTOHEADER --version) < /dev/null > /dev/null 2>&1 || {
+#        echo
+#        echo "You must have $AUTOHEADER installed to compile $PROJECT."
+#        echo "Download the appropriate package for your distribution,"
+#        echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/"
+#        DIE=1
+#}
+
+($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || {
+        echo
+        echo "You must have $AUTOMAKE installed to compile $PROJECT."
+        echo "Download the appropriate package for your distribution,"
+        echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
+        DIE=1
+}
+
+($AUTOCONF --version) < /dev/null > /dev/null 2>&1 || {
+        echo
+        echo "You must have $AUTOCONF installed to compile $PROJECT."
+        echo "Download the appropriate package for your distribution,"
+        echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/"
+        DIE=1
+}
+
+if test "$DIE" -eq 1; then
+        exit 1
+fi
+
+test $TEST_TYPE $FILE || {
+        echo "You must run this script in the top-level $PROJECT directory"
+        exit 1
+}
+
+if test -z "$*"; then
+        echo "I am going to run ./configure with no arguments - if you wish "
+        echo "to pass any to it, please specify them on the $0 command line."
+fi
+
+#$LIBTOOLIZE --copy --force || echo "$LIBTOOlIZE failed"
+$ACLOCAL || echo "$ACLOCAL failed"
+#$AUTOHEADER || echo "$AUTOHEADER failed"
+$AUTOMAKE --add-missing --force-missing --copy || echo "$AUTOMAKE failed"
+$AUTOCONF || echo "$AUTOCONF failed"
+
+cd $ORIGDIR
+
+run_configure=true
+for arg in $*; do
+    case $arg in
+        --no-configure)
+            run_configure=false
+            ;;
+        *)
+            ;;
+    esac
+done
+
+if $run_configure; then
+    $srcdir/configure --enable-maintainer-mode "$@"
+    echo
+    echo "Now type 'make' to compile $PROJECT."
+else
+    echo
+    echo "Now run 'configure' and 'make' to compile $PROJECT."
+fi
Index: /trunk/ppMerge/configure.ac
===================================================================
--- /trunk/ppMerge/configure.ac	(revision 6904)
+++ /trunk/ppMerge/configure.ac	(revision 6904)
@@ -0,0 +1,35 @@
+AC_PREREQ(2.59)
+
+AC_INIT([ppImage], [0.0.1], [price@ifa.hawaii.edu])
+AC_CONFIG_SRCDIR([src])
+
+AM_INIT_AUTOMAKE([1.6 foreign dist-bzip2])
+dnl AM_CONFIG_HEADER([config.h])
+AM_MAINTAINER_MODE
+
+AC_LANG(C)
+AC_GNU_SOURCE
+AC_PROG_CC
+AC_PROG_INSTALL
+dnl AC_PROG_LIBTOOL
+
+dnl handle debug building
+AC_ARG_ENABLE(optimize,
+  [AS_HELP_STRING(--enable-optimize,enable compiler optimization)],
+  [AC_MSG_RESULT(compile optimization enabled)
+   CFLAGS="${CFLAGS=} -O2"],
+  [AC_MSG_RESULT([compile optimization disabled])
+   CFLAGS="${CFLAGS=} -O0 -g"]
+)
+
+PKG_CHECK_MODULES([PSLIB], [pslib >= 0.9.0]) 
+PKG_CHECK_MODULES([PSMODULE], [psmodule >= 0.0.0]) 
+
+ppImage_CFLAGS="-Wall -Werror -std=c99"
+AC_SUBST([ppImage_CFLAGS])
+
+AC_CONFIG_FILES([
+  Makefile
+  src/Makefile
+])
+AC_OUTPUT
Index: /trunk/ppMerge/src/Makefile.am
===================================================================
--- /trunk/ppMerge/src/Makefile.am	(revision 6904)
+++ /trunk/ppMerge/src/Makefile.am	(revision 6904)
@@ -0,0 +1,42 @@
+bin_PROGRAMS = ppImage
+
+ppImage_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(ppImage_CFLAGS)
+ppImage_LDADD = $(PSLIB_LIBS) $(PSMODULE_LIBS)
+ppImage_SOURCES = \
+	ppConfig.c \
+	ppFile.c \
+	ppMem.c \
+	ppImage.c \
+	ppImageConfig.c \
+	ppImageData.c \
+	ppImageDetrendBias.c \
+	ppImageDetrendCell.c \
+	ppImageDetrendMask.c \
+	ppImageDetrendNonLinear.c \
+	ppImageLoop.c \
+	ppImageOptions.c \
+	ppImageParseCamera.c \
+	ppImageParseDetrend.c \
+	ppImageWeights.c
+#	ppImageLoadPixels.c
+#	ppDetrendFlat.c
+#	ppImageOutput.c
+#	ppImageDetrendPedestal.c
+#	ppImageOutput.c
+#	ppImagePhot.c
+
+
+noinst_HEADERS = \
+	ppConfig.h \
+	ppFile.h \
+	ppMem.h \
+	ppImage.h \
+	ppImageData.h \
+	ppImageDetrend.h \
+	ppImageOptions.h
+
+clean-local:
+	-rm -f TAGS
+# Tags for emacs
+tags:
+	etags `find . -name \*.[ch] -print`