Index: trunk/psphot/Makefile
===================================================================
--- trunk/psphot/Makefile	(revision 5802)
+++ trunk/psphot/Makefile	(revision 5828)
@@ -21,43 +21,42 @@
 
 PSPHOT = \
-$(SRC)/psphot.$(ARCH).o            \
-$(SRC)/psphotArguments.$(ARCH).o   \
-$(SRC)/psphotSetup.$(ARCH).o	   \
-$(SRC)/psphotImageStats.$(ARCH).o  \
-$(SRC)/psphotSourceStats.$(ARCH).o \
-$(SRC)/psphotChoosePSF.$(ARCH).o   \
-$(SRC)/psphotApplyPSF.$(ARCH).o	   \
-$(SRC)/psphotFixedPSF.$(ARCH).o	   \
+$(SRC)/psphot.$(ARCH).o             \
+$(SRC)/psphotArguments.$(ARCH).o    \
+$(SRC)/psphotSetup.$(ARCH).o	    \
+$(SRC)/psphotImageStats.$(ARCH).o   \
+$(SRC)/psphotSourceStats.$(ARCH).o  \
+$(SRC)/psphotChoosePSF.$(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)/psphotSortBySN.$(ARCH).o    \
-$(SRC)/psphotDefinePixels.$(ARCH).o\
-$(SRC)/psphotMagnitudes.$(ARCH).o  \
-$(SRC)/psphotImageBackground.$(ARCH).o  \
-$(SRC)/psphotBasicDeblend.$(ARCH).o  \
+$(SRC)/psphotReapplyPSF.$(ARCH).o   \
+$(SRC)/psphotFitGalaxies.$(ARCH).o  \
+$(SRC)/psphotOutput.$(ARCH).o       \
+$(SRC)/psphotMarkPSF.$(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)/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)/psphotRadiusChecks.$(ARCH).o  \
-$(SRC)/psphotReplaceUnfit.$(ARCH).o  \
-$(SRC)/psphotEvalPSF.$(ARCH).o  \
-$(SRC)/psphotEvalFLT.$(ARCH).o  \
-$(SRC)/psphotFullFit.$(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)/psphotApResid.$(ARCH).o
-
-PSMODULES = \
-$(SRC)/psEllipse.$(ARCH).o         \
-$(SRC)/pmPSF.$(ARCH).o             \
-$(SRC)/pmPSFtry.$(ARCH).o          \
-$(SRC)/pmModelGroup.$(ARCH).o      \
-$(SRC)/pmObjects_EAM.$(ARCH).o
+$(SRC)/pmModelFitSet.$(ARCH).o  \
+$(SRC)/pmSourceFitSet.$(ARCH).o        \
+$(SRC)/psphotSourceFits.$(ARCH).o        \
+$(SRC)/psphotBlendFit.$(ARCH).o        \
+$(SRC)/psphotApResid.$(ARCH).o \
+$(SRC)/psBicube.$(ARCH).o 
 
 MODELS = \
@@ -91,5 +90,5 @@
 psphot: $(BIN)/psphot.$(ARCH)
 $(BIN)/psphot.$(ARCH) : $(PSPHOT)
-$(PSPHOT) $(PSMODULES): $(SRC)/psphot.h
+$(PSPHOT) : $(SRC)/psphot.h
 
 modeltest.install: psphotModelTest.install