Index: trunk/psphot/src/Makefile.am
===================================================================
--- trunk/psphot/src/Makefile.am	(revision 7438)
+++ trunk/psphot/src/Makefile.am	(revision 7504)
@@ -1,9 +1,9 @@
 
 lib_LTLIBRARIES = libpsphot.la
-libpsphot_la_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(psphot_CFLAGS)
+libpsphot_la_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSPHOT_CFLAGS)
 # libpsphot_la_LDFLAGS = $(PSMODULE_LIBS) $(PSLIB_LIBS)
 
 bin_PROGRAMS = psphot
-psphot_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(psphot_CFLAGS)
+psphot_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSPHOT_CFLAGS)
 psphot_LDFLAGS = $(PSLIB_LIBS) $(PSMODULE_LIBS)
 psphot_LDADD = libpsphot.la
@@ -17,5 +17,5 @@
 
 libpsphot_la_SOURCES = \
-	errorCodes.c		\
+	psphotErrorCodes.c	\
 	psphotModelGroupInit.c	\
 	psphotArguments.c	\
@@ -50,5 +50,6 @@
 
 include_HEADERS = \
-	psphot.h		
+	psphot.h \
+	psphotErrorCodes.h
 
 clean-local:
@@ -61,10 +62,10 @@
 # Error codes.
 #
-BUILT_SOURCES = psphotErrorCodes.h errorCodes.c
-CLEANFILES = psphotErrorCodes.h errorCodes.c
+BUILT_SOURCES = psphotErrorCodes.h psphotErrorCodes.c
+CLEANFILES = psphotErrorCodes.h psphotErrorCodes.c
 
-psphotErrorCodes.h : errorCodes.dat psphotErrorCodes.h.in
-	$(ERRORCODES) --data=errorCodes.dat --outdir=. psphotErrorCodes.h
+psphotErrorCodes.h : psphotErrorCodes.dat psphotErrorCodes.h.in
+	$(ERRORCODES) --data=psphotErrorCodes.dat --outdir=. psphotErrorCodes.h
 
-errorCodes.c : errorCodes.dat errorCodes.c.in psphotErrorCodes.h
-	$(ERRORCODES) --data=errorCodes.dat --outdir=. errorCodes.c
+psphotErrorCodes.c : psphotErrorCodes.dat psphotErrorCodes.c.in psphotErrorCodes.h
+	$(ERRORCODES) --data=psphotErrorCodes.dat --outdir=. psphotErrorCodes.c