Changeset 7504

Timestamp:

Jun 9, 2006, 6:23:49 PM (20 years ago)

Author:

eugene

Message:

config fixes to support pkg-config, moved errorCodes to psphotErrorCodes, updates to support psphot as library

Location:

trunk/psphot

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (1 diff)
• psphot.pc.in (added)
• src/Makefile.am (modified) (4 diffs)
• src/errorCodes.c.in (deleted)
• src/errorCodes.dat (deleted)
• src/psphotErrorCodes.c.in (added)
• src/psphotErrorCodes.dat (added)

trunk/psphot/Makefile.am

@@ -3 +3 @@
 CLEANFILES = *.pyc *~ core core.*
 
-EXTRA_DIST = autogen.sh
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA= psphot.pc
+
+EXTRA_DIST = \
+        psphot.pc.in \
+        autogen.sh

trunk/psphot/configure.ac

@@ -42 +42 @@
 
 dnl Set CFLAGS for build
-CFLAGS="${CFLAGS}"
-psphot_CFLAGS="-Wall -Werror -std=c99"
-AC_SUBST([psphot_CFLAGS])
+CFLAGS="${CFLAGS} -Wall -Werror -std=c99"
+
+AC_SUBST([PSPHOT_CFLAGS])
+AC_SUBST([PSPHOT_LIBS])
 
 AC_CONFIG_FILES([
   Makefile
   src/Makefile
+  psphot.pc
 ])
 

trunk/psphot/src/Makefile.am

@@ -1 +1 @@
 
 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 +17 @@
 
 libpsphot_la_SOURCES = \
-        errorCodes.c            \
+        psphotErrorCodes.c      \
         psphotModelGroupInit.c  \
         psphotArguments.c       \
@@ -50 +50 @@
 
 include_HEADERS = \
-        psphot.h                
+        psphot.h \
+        psphotErrorCodes.h
 
 clean-local:
@@ -61 +62 @@
 # 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