Index: trunk/psphot/Makefile
===================================================================
--- trunk/psphot/Makefile	(revision 5980)
+++ trunk/psphot/Makefile	(revision 5993)
@@ -24,76 +24,55 @@
 $(SRC)/psphotArguments.$(ARCH).o    \
 $(SRC)/psphotSetup.$(ARCH).o	    \
+$(SRC)/psphotModelTest.$(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)/psphotFixedPSF.$(ARCH).o	    \
-$(SRC)/psphotEnsemblePSF.$(ARCH).o  \
-$(SRC)/psphotReapplyPSF.$(ARCH).o   \
 $(SRC)/psphotFitGalaxies.$(ARCH).o  \
-$(SRC)/psphotOutput.$(ARCH).o       \
-$(SRC)/psphotMarkPSF.$(ARCH).o      \
+$(SRC)/psphotReplaceUnfit.$(ARCH).o \
+$(SRC)/psphotApResid.$(ARCH).o      \
+$(SRC)/psphotOutput.$(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 \
-$(SRC)/psphotReplaceUnfit.$(ARCH).o \
-$(SRC)/psphotEvalPSF.$(ARCH).o      \
-$(SRC)/psphotEvalFLT.$(ARCH).o      \
-$(SRC)/psphotFullFit.$(ARCH).o      \
+$(SRC)/psphotRadiusChecks.$(ARCH).o 
+
+PSMODULES = \
+$(SRC)/psLine.$(ARCH).o		    \
+$(SRC)/psSparse.$(ARCH).o           \
+$(SRC)/psPolynomialUtils.$(ARCH).o  \
+$(SRC)/psImageData.$(ARCH).o        \
+$(SRC)/psModulesUtils.$(ARCH).o	    \
 $(SRC)/pmSourceContour.$(ARCH).o    \
-$(SRC)/psLine.$(ARCH).o		    \
-$(SRC)/psModulesUtils.$(ARCH).o	    \
-$(SRC)/pmPeaksSigmaLimit.$(ARCH).o  \
-$(SRC)/pmSourceFitFixed.$(ARCH).o   \
-$(SRC)/psSparse.$(ARCH).o           \
-$(SRC)/psImageData.$(ARCH).o        \
-$(SRC)/psphotModelTest.$(ARCH).o    \
-$(SRC)/psphotImageBackground.$(ARCH).o \
-$(SRC)/psphotBasicDeblend.$(ARCH).o    \
-$(SRC)/psphotModelGroupInit.$(ARCH).o  \
-$(SRC)/pmModelFitSet.$(ARCH).o  \
-$(SRC)/pmSourceFitSet.$(ARCH).o        \
-$(SRC)/psphotSourceFits.$(ARCH).o        \
-$(SRC)/psphotBlendFit.$(ARCH).o        \
-$(SRC)/psphotApResid.$(ARCH).o \
-$(SRC)/psphotAssessPSF.$(ARCH).o \
-$(SRC)/psBicube.$(ARCH).o 
-
-MODELS = \
-$(SRC)/models/pmModel_GAUSS.c      \
-$(SRC)/models/pmModel_PGAUSS.c     \
-$(SRC)/models/pmModel_QGAUSS.c     \
-$(SRC)/models/pmModel_SGAUSS.c     \
-$(SRC)/models/pmModel_TGAUSS.c      
-
-$(SRC)/pmModelGroup.$(ARCH).o: $(MODELS)
-
-MODELTEST = \
-$(SRC)/modelTestFitSource.$(ARCH).o \
-$(SRC)/modelTestArguments.$(ARCH).o \
-$(SRC)/psphotModelGroupInit.$(ARCH).o  \
-$(SRC)/psModulesUtils.$(ARCH).o	    \
-$(SRC)/psImageData.$(ARCH).o        \
-$(SRC)/psphotSetup.$(ARCH).o	    \
-$(SRC)/psphotDefinePixels.$(ARCH).o \
-$(SRC)/psphotModelTest.$(ARCH).o
+$(SRC)/pmModelFitSet.$(ARCH).o      \
+$(SRC)/pmSourceFitSet.$(ARCH).o     
 
 TEST = \
-$(SRC)/psphotTest.$(ARCH).o \
-$(SRC)/psphotTestArguments.$(ARCH).o \
-$(SRC)/psphotApResid.$(ARCH).o
+$(SRC)/psphotTest.$(ARCH).o     \
+$(SRC)/psBicube.$(ARCH).o           \
+$(SRC)/psphotTestArguments.$(ARCH).o
 
 psphot: $(BIN)/psphot.$(ARCH)
-$(BIN)/psphot.$(ARCH) : $(PSPHOT)
+$(BIN)/psphot.$(ARCH) : $(PSPHOT) $(PSMODULES) $(SUPPORT)
 $(PSPHOT) : $(SRC)/psphot.h
 
-modeltest.install: psphotModelTest.install
-modeltest: $(BIN)/psphotModelTest.$(ARCH)
-$(BIN)/psphotModelTest.$(ARCH) : $(MODELTEST)
-$(MODELTEST): $(SRC)/psphot.h
+test.install: psphotTest.install
+test: $(BIN)/psphotTest.$(ARCH)
+$(DESTBIN)/test : $(DESTBIN)/psphotTest
 
-test-install: psphotTest.install
-test: $(BIN)/psphotTest.$(ARCH)
 $(BIN)/psphotTest.$(ARCH) : $(TEST)
 $(TEST): $(SRC)/psphot.h