Index: unk/psphot/Makefile
===================================================================
--- /trunk/psphot/Makefile	(revision 6139)
+++ 	(revision )
@@ -1,142 +1,0 @@
-default: psphot
-help:
-	@echo "USAGE: make psphot"
-
-CC      =       gcc
-SRC     =       src
-BIN     =       bin
-LIB     =       lib
-
-DESTBIN =       $(HOME)/src/bin/$(ARCH)
-DESTLIB =       $(HOME)/src/lib/$(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) -L$(DESTLIB) -lpsphot -ljpeg 
-
-PSPHOT = \
-$(SRC)/psphot.$(ARCH).o             \
-$(SRC)/psphotArguments.$(ARCH).o    \
-$(SRC)/psphotParseCamera.$(ARCH).o    \
-$(SRC)/psphotImageLoop.$(ARCH).o    \
-$(SRC)/psphotModelTest.$(ARCH).o    \
-
-LIBPSPHOT = \
-$(SRC)/psphotReadout.$(ARCH).o    \
-$(SRC)/psphotImageStats.$(ARCH).o   \
-$(SRC)/psphotImageBackground.$(ARCH).o \
-$(SRC)/psphotFindPeaks.$(ARCH).o    \
-$(SRC)/psphotSourceStats.$(ARCH).o  \
-$(SRC)/psphotRoughClass.$(ARCH).o   \
-$(SRC)/psphotBasicDeblend.$(ARCH).o \
-$(SRC)/psphotChoosePSF.$(ARCH).o    \
-$(SRC)/psphotEnsemblePSF.$(ARCH).o  \
-$(SRC)/psphotFullFit.$(ARCH).o      \
-$(SRC)/psphotBlendFit.$(ARCH).o     \
-$(SRC)/psphotApplyPSF.$(ARCH).o	    \
-$(SRC)/psphotFitGalaxies.$(ARCH).o  \
-$(SRC)/psphotReplaceUnfit.$(ARCH).o \
-$(SRC)/psphotApResid.$(ARCH).o      \
-$(SRC)/psphotOutput.$(ARCH).o       \
-$(SRC)/psphotLoadPixels.$(ARCH).o       
-
-SUPPORT = \
-$(SRC)/psphotModelGroupInit.$(ARCH).o  \
-$(SRC)/psphotGrowthCurve.$(ARCH).o  \
-$(SRC)/psphotEvalPSF.$(ARCH).o      \
-$(SRC)/psphotEvalFLT.$(ARCH).o      \
-$(SRC)/psphotSourceFits.$(ARCH).o   \
-$(SRC)/psphotSortBySN.$(ARCH).o     \
-$(SRC)/psphotDefinePixels.$(ARCH).o \
-$(SRC)/psphotMagnitudes.$(ARCH).o   \
-$(SRC)/psphotRadiusChecks.$(ARCH).o 
-
-PSMODULES = \
-$(SRC)/psLine.$(ARCH).o		    \
-$(SRC)/psSparse.$(ARCH).o           \
-$(SRC)/psPolynomialUtils.$(ARCH).o  \
-$(SRC)/psModulesUtils.$(ARCH).o	    \
-$(SRC)/pmSourceContour.$(ARCH).o    \
-$(SRC)/pmModelFitSet.$(ARCH).o      \
-$(SRC)/pmCellSetMask.$(ARCH).o      \
-$(SRC)/pmSourceFitSet.$(ARCH).o     
-
-TEST = \
-$(SRC)/psphotTest.$(ARCH).o     \
-$(SRC)/psImageJpeg.$(ARCH).o           \
-$(SRC)/psphotTestArguments.$(ARCH).o
-
-OLD = \
-$(SRC)/psImageData.$(ARCH).o  \
-$(SRC)/psphotSetup.$(ARCH).o	    
-
-psphot: $(BIN)/psphot.$(ARCH)
-$(BIN)/psphot.$(ARCH) : $(PSPHOT) $(DESTLIB)/libpsphot.a 
-$(PSPHOT) : $(SRC)/psphot.h
-
-libinstall: $(DESTLIB)/libpsphot.a
-libpsphot: $(LIB)/libpsphot.$(ARCH).a
-
-test.install: psphotTest.install
-test: $(BIN)/psphotTest.$(ARCH)
-$(DESTBIN)/test : $(DESTBIN)/psphotTest
-
-$(BIN)/psphotTest.$(ARCH) : $(TEST)
-$(TEST): $(SRC)/psphot.h
-
-INSTALL = psphot
-
-# 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
-
-$(DESTLIB)/libpsphot.a: $(LIB)/libpsphot.$(ARCH).a
-	@if [ ! -d $(DESTLIB) ]; then mkdir -p $(DESTLIB); fi
-	rm -f $(DESTLIB)/libpsphot.a
-	cp $(LIB)/libpsphot.$(ARCH).a $(DESTLIB)/libpsphot.a
-
-$(LIB)/libpsphot.$(ARCH).a: $(LIBPSPHOT) $(PSMODULES) $(SUPPORT)
-	@if [ ! -d $(LIB) ]; then mkdir -p $(LIB); fi
-	rm -f $(LIB)/libpsphot.$(ARCH).a
-	ar rcv $(LIB)/libpsphot.$(ARCH).a $^
-	$(RANLIB) $(LIB)/libpsphot.$(ARCH).a
-
-$(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/psphot/Makefile.am
===================================================================
--- /trunk/psphot/Makefile.am	(revision 6140)
+++ /trunk/psphot/Makefile.am	(revision 6140)
@@ -0,0 +1,5 @@
+SUBDIRS = src
+
+CLEANFILES = *.pyc *~ core core.*
+
+EXTRA_DIST = autogen.sh
Index: /trunk/psphot/autogen.sh
===================================================================
--- /trunk/psphot/autogen.sh	(revision 6140)
+++ /trunk/psphot/autogen.sh	(revision 6140)
@@ -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=psphot
+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/psphot/configure.ac
===================================================================
--- /trunk/psphot/configure.ac	(revision 6140)
+++ /trunk/psphot/configure.ac	(revision 6140)
@@ -0,0 +1,38 @@
+dnl Process this file with autoconf to produce a configure script.
+AC_PREREQ(2.59)
+
+AC_INIT([psphot], [0.0.1], [http://pan-starrs.ifa.hawaii.edu])
+AC_CONFIG_SRCDIR([autogen.sh])
+
+AM_INIT_AUTOMAKE([1.6 foreign dist-bzip2])
+AM_CONFIG_HEADER([config.h])
+AM_MAINTAINER_MODE
+
+AC_LANG(C)
+AC_PROG_CC
+AC_PROG_INSTALL
+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)
+AC_CHECK_LIB(jpeg,jpeg_CreateCompress,[],[AC_MSG_ERROR([jpeg library not found.])])
+
+dnl Set CFLAGS for build
+psphot_CFLAGS="-Wall -Werror -std=c99"
+AC_SUBST([psphot_CFLAGS])
+
+AC_CONFIG_FILES([
+  Makefile
+  src/Makefile
+])
+
+AC_OUTPUT
Index: /trunk/psphot/src/Makefile.am
===================================================================
--- /trunk/psphot/src/Makefile.am	(revision 6140)
+++ /trunk/psphot/src/Makefile.am	(revision 6140)
@@ -0,0 +1,73 @@
+lib_LTLIBRARIES = libpsphot.la
+bin_PROGRAMS = psphot psphotTest
+
+libpsphot_la_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(psphot_CFLAGS)
+libpsphot_la_LDFLAGS = $(PSLIB_LIBS) $(PSMODULE_LIBS)
+
+psphot_CPPFLAGS = $(libpsphot_la_CPPFLAGS)
+psphot_LDADD = $(libpsphot_la_LADDADD) -lpsphot
+
+psphotTest_CPPFLAGS = $(libpsphot_la_CPPFLAGS)
+psphotTest_LDADD = $(libpsphot_la_LADDADD) -lpsphot
+
+
+libpsphot_la_SOURCES =		\
+	psphotReadout.c		\
+	psphotImageStats.c	\
+	psphotImageBackground.c \
+	psphotFindPeaks.c	\
+	psphotSourceStats.c	\
+	psphotRoughClass.c	\
+	psphotBasicDeblend.c	\
+	psphotChoosePSF.c	\
+	psphotEnsemblePSF.c	\
+	psphotFullFit.c		\
+	psphotBlendFit.c	\
+	psphotApplyPSF.c	\
+	psphotFitGalaxies.c	\
+	psphotReplaceUnfit.c	\
+	psphotApResid.c		\
+	psphotOutput.c		\
+	psphotLoadPixels.c	\
+	psphotModelGroupInit.c	\
+	psphotGrowthCurve.c	\
+	psphotEvalPSF.c		\
+	psphotEvalFLT.c		\
+	psphotSourceFits.c	\
+	psphotSortBySN.c	\
+	psphotDefinePixels.c	\
+	psphotMagnitudes.c	\
+	psphotRadiusChecks.c	\
+	psLine.c		\
+	psSparse.c		\
+	psPolynomialUtils.c	\
+	psModulesUtils.c	\
+	pmSourceContour.c	\
+	pmModelFitSet.c		\
+	pmCellSetMask.c		\
+	pmSourceFitSet.c     
+
+
+psphot_SOURCES =		\
+	psphot.c		\
+	psphotArguments.c	\
+	psphotParseCamera.c	\
+	psphotImageLoop.c	\
+	psphotModelTest.c
+
+psphotTest_SOURCES =		\
+	psphotTest.c		\
+	psImageJpeg.c		\
+	psphotTestArguments.c
+
+include_HEADERS =		\
+	psLibUtils.h		\
+	psModulesUtils.h	\
+	psphot.h		\
+	psSparse.h
+
+clean-local:
+	-rm -f TAGS
+# Tags for emacs
+tags:
+	etags `find . -name \*.[ch] -print`