Index: trunk/psastro/Makefile
===================================================================
--- trunk/psastro/Makefile	(revision 5360)
+++ trunk/psastro/Makefile	(revision 5560)
@@ -1,5 +1,5 @@
-default: psphot
+default: psastro
 help:
-	@echo "USAGE: make psphot"
+	@echo "USAGE: make psastro"
 
 CC      =       gcc
@@ -12,69 +12,40 @@
 IPSLIB  :=      $(shell pslib-config --cflags)
 
-INCS	= 	$(IPSLIB)
-# LIBS	= 	-lpsmodule $(LPSLIB)
-LIBS	= 	$(LPSLIB)
+LPSMOD  :=      $(shell psmodule-config --libs)
+IPSMOD  :=      $(shell psmodule-config --cflags)
+
+INCS	= 	$(IPSLIB) $(IPSMOD)
+LIBS	= 	$(LPSLIB) $(LPSMOD)
 CFLAGS	=	$(INCS) -std=c99 -Wall -Werror -g
 # CFLAGS	=	$(INCS) -std=c99 -g
 LFLAGS	=	$(LIBS) 
 
-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)/psphotFitGalaxies.$(ARCH).o \
-$(SRC)/psphotOutput.$(ARCH).o      \
-$(SRC)/psphotMarkPSF.$(ARCH).o     \
-$(SRC)/psphotSubtractPSF.$(ARCH).o \
-$(SRC)/psphotSortBySN.$(ARCH).o    \
-$(SRC)/psphotDefinePixels.$(ARCH).o \
-$(SRC)/psphotMagnitudes.$(ARCH).o  \
+PSASTRO = \
+$(SRC)/psastro.$(ARCH).o           \
+$(SRC)/psastroIO.$(ARCH).o	   \
+$(SRC)/psastroBuildFPA.$(ARCH).o   \
+$(SRC)/psastroArguments.$(ARCH).o  \
+$(SRC)/psastroUtils.$(ARCH).o	   \
 $(SRC)/psLibUtils.$(ARCH).o	   \
-$(SRC)/psLine.$(ARCH).o		   \
-$(SRC)/psMinimize.$(ARCH).o	   \
-$(SRC)/psPolynomials.$(ARCH).o	   \
-$(SRC)/psEllipse.$(ARCH).o         \
-$(SRC)/psModulesUtils.$(ARCH).o	   \
-$(SRC)/pmPeaksSigmaLimit.$(ARCH).o \
-$(SRC)/pmPSF.$(ARCH).o             \
-$(SRC)/pmPSFtry.$(ARCH).o          \
-$(SRC)/psImageData.$(ARCH).o	   \
-$(SRC)/pmModelGroup.$(ARCH).o       \
-$(SRC)/pmObjects_EAM.$(ARCH).o
+$(SRC)/pmAstrom.$(ARCH).o	   \
+$(SRC)/pmAstromGrid.$(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      
+PSASTRO-MKTEST = \
+$(SRC)/psastro-mktest.$(ARCH).o    \
+$(SRC)/psastroArguments.$(ARCH).o  \
+$(SRC)/psLibUtils.$(ARCH).o        \
+$(SRC)/pmAstrom.$(ARCH).o
 
-$(SRC)/pmModelGroup.$(ARCH).o: $(MODELS)
+# $(SRC)/psModUtils.$(ARCH).o	   \
 
-# deprecated
+psastro: $(BIN)/psastro.$(ARCH)
+$(BIN)/psastro.$(ARCH) : $(PSASTRO)
+$(PSASTRO): $(SRC)/psastro.h $(SRC)/pmAstrom.h
 
-FITSOURCE = \
-$(SRC)/fitsource.$(ARCH).o \
-$(SRC)/onesource.$(ARCH).o \
-$(SRC)/fs_args.$(ARCH).o \
-$(SRC)/psphot-utils.$(ARCH).o \
-$(SRC)/psPolynomials.$(ARCH).o \
-$(SRC)/psUtils.$(ARCH).o \
-$(SRC)/setup.$(ARCH).o \
-$(SRC)/LocalSky.$(ARCH).o
+psastro-mktest: $(BIN)/psastro-mktest.$(ARCH)
+$(BIN)/psastro-mktest.$(ARCH) : $(PSASTRO-MKTEST)
+$(PSASTRO-MKTEST): $(SRC)/psastro.h $(SRC)/pmAstrom.h
 
-psphot: $(BIN)/psphot.$(ARCH)
-$(BIN)/psphot.$(ARCH) : $(PSPHOT)
-$(PSPHOT): $(SRC)/psphot.h
-
-fitsource: $(BIN)/fitsource.$(ARCH)
-$(BIN)/fitsource.$(ARCH) : $(FITSOURCE)
-$(FITSOURCE): $(SRC)/psphot.h
-
-INSTALL = psphot
+INSTALL = psastro psastro-mktest
 
 # dependancy rules for binary code #########################