Index: trunk/psphot/Makefile
===================================================================
--- trunk/psphot/Makefile	(revision 6056)
+++ trunk/psphot/Makefile	(revision 6130)
@@ -6,6 +6,8 @@
 SRC     =       src
 BIN     =       bin
+LIB     =       lib
 
 DESTBIN =       $(HOME)/src/bin/$(ARCH)
+DESTLIB =       $(HOME)/src/lib/$(ARCH)
 
 LPSLIB  :=      $(shell pslib-config --libs)
@@ -17,12 +19,16 @@
 INCS	= 	$(IPSLIB) $(IPSMOD)
 LIBS	= 	$(LPSLIB) $(LPSMOD)
-CFLAGS	=	$(INCS) -std=c99 -Wall -Werror -O2
-LFLAGS	=	$(LIBS) 
+CFLAGS	=	$(INCS) -std=c99 -Wall -Werror -g
+LFLAGS	=	$(LIBS) -L$(DESTLIB) -lpsphot -ljpeg 
 
 PSPHOT = \
 $(SRC)/psphot.$(ARCH).o             \
 $(SRC)/psphotArguments.$(ARCH).o    \
-$(SRC)/psphotSetup.$(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 \
@@ -39,5 +45,6 @@
 $(SRC)/psphotReplaceUnfit.$(ARCH).o \
 $(SRC)/psphotApResid.$(ARCH).o      \
-$(SRC)/psphotOutput.$(ARCH).o       
+$(SRC)/psphotOutput.$(ARCH).o       \
+$(SRC)/psphotLoadPixels.$(ARCH).o       
 
 SUPPORT = \
@@ -59,18 +66,22 @@
 $(SRC)/pmSourceContour.$(ARCH).o    \
 $(SRC)/pmModelFitSet.$(ARCH).o      \
+$(SRC)/pmCellSetMask.$(ARCH).o      \
 $(SRC)/pmSourceFitSet.$(ARCH).o     
 
 TEST = \
 $(SRC)/psphotTest.$(ARCH).o     \
-$(SRC)/psBicube.$(ARCH).o           \
+$(SRC)/psImageJpeg.$(ARCH).o           \
 $(SRC)/psphotTestArguments.$(ARCH).o
 
 OLD = \
-$(SRC)/psImageData.$(ARCH).o        
-
+$(SRC)/psImageData.$(ARCH).o  \
+$(SRC)/psphotSetup.$(ARCH).o	    
 
 psphot: $(BIN)/psphot.$(ARCH)
-$(BIN)/psphot.$(ARCH) : $(PSPHOT) $(PSMODULES) $(SUPPORT)
+$(BIN)/psphot.$(ARCH) : $(PSPHOT) $(DESTLIB)/libpsphot.a 
 $(PSPHOT) : $(SRC)/psphot.h
+
+libinstall: $(DESTLIB)/libpsphot.a
+libpsphot: $(LIB)/libpsphot.$(ARCH).a
 
 test.install: psphotTest.install
@@ -100,4 +111,15 @@
 	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)