Index: trunk/psphot/src/Makefile.am
===================================================================
--- trunk/psphot/src/Makefile.am	(revision 6141)
+++ trunk/psphot/src/Makefile.am	(revision 6311)
@@ -1,16 +1,15 @@
-lib_LTLIBRARIES = libpsphot.la
-bin_PROGRAMS = psphot psphotTest
+# lib_LTLIBRARIES = libpsphot.la
+# libpsphot_la_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(psphot_CFLAGS)
+# libpsphot_la_LDFLAGS = $(PSMODULE_LIBS) $(PSLIB_LIBS)
 
-libpsphot_la_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(psphot_CFLAGS)
-libpsphot_la_LDFLAGS = $(PSLIB_LIBS) $(PSMODULE_LIBS)
+bin_PROGRAMS = psphot
+psphot_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(psphot_CFLAGS)
+psphot_LDFLAGS = $(PSLIB_LIBS) $(PSMODULE_LIBS)
 
-psphot_CPPFLAGS = $(libpsphot_la_CPPFLAGS)
-psphot_LDADD = libpsphot.la
+# psphot_CPPFLAGS = $(libpsphot_la_CPPFLAGS)
+# psphot_LDFLAGS =  $(PSMODULE_LIBS) $(PSLIB_LIBS)
+# psphot_LDADD = libpsphot.la
 
-psphotTest_CPPFLAGS = $(libpsphot_la_CPPFLAGS)
-psphotTest_LDADD = libpsphot.la
-
-
-libpsphot_la_SOURCES =		\
+psphot_SOURCES =		\
 	psphotReadout.c		\
 	psphotImageStats.c	\
@@ -46,20 +45,12 @@
 	pmModelFitSet.c		\
 	pmCellSetMask.c		\
-	pmSourceFitSet.c     
-
-
-psphot_SOURCES =		\
+	pmSourceFitSet.c     	\
 	psphot.c		\
 	psphotArguments.c	\
 	psphotParseCamera.c	\
-	psphotImageLoop.c	\
-	psphotModelTest.c
+	psphotModelTest.c	\
+	psphotImageLoop.c	
 
-psphotTest_SOURCES =		\
-	psphotTest.c		\
-	psImageJpeg.c		\
-	psphotTestArguments.c
-
-include_HEADERS =		\
+noinst_HEADERS =		\
 	psLibUtils.h		\
 	psModulesUtils.h	\