Changeset 7438

Timestamp:

Jun 8, 2006, 10:58:34 AM (20 years ago)

Author:

eugene

Message:

adjusted configure scripts to build libpsphot without psphot.c

Location:

trunk/psphot

Files:

• configure.ac (modified) (1 diff)
• src/Makefile.am (modified) (4 diffs)

trunk/psphot/configure.ac

@@ -65 +65 @@
 dnl ------------------------------------------------------------
 
+AC_PATH_PROG([ERRORCODES], [psParseErrorCodes], [missing])
+if test "$ERRORCODES" = "missing" ; then
+  AC_MSG_ERROR([psParseErrorCodes is required])
+fi
+
 PKG_CHECK_MODULES(PSLIB, pslib >= 0.9.0)
 PKG_CHECK_MODULES(PSMODULE, psmodule >= 0.0.0)

trunk/psphot/src/Makefile.am

@@ +1 @@
+
 lib_LTLIBRARIES = libpsphot.la
 libpsphot_la_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(psphot_CFLAGS)
-libpsphot_la_LDFLAGS = $(PSMODULE_LIBS) $(PSLIB_LIBS)
-libpsphot_la_SOURCES = $(psphot_SOURCES)
+# libpsphot_la_LDFLAGS = $(PSMODULE_LIBS) $(PSLIB_LIBS)
 
 bin_PROGRAMS = psphot
 psphot_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(psphot_CFLAGS)
 psphot_LDFLAGS = $(PSLIB_LIBS) $(PSMODULE_LIBS)
+psphot_LDADD = libpsphot.la
 
-PSLIB_DIR = `pslib-config --prefix`
+psphot_SOURCES = \
+        psphot.c                
 
 # psphot_CPPFLAGS = $(libpsphot_la_CPPFLAGS)
@@ -14 +16 @@
 # psphot_LDADD = libpsphot.la
 
-psphot_SOURCES =                \
-        psphot.c                \
+libpsphot_la_SOURCES = \
         errorCodes.c            \
         psphotModelGroupInit.c  \
@@ -48 +49 @@
         psphotCleanup.c         
 
-noinst_HEADERS =                \
+include_HEADERS = \
         psphot.h                
 
 clean-local:
         -rm -f TAGS
+
 # Tags for emacs
 tags:
@@ -63 +65 @@
 
 psphotErrorCodes.h : errorCodes.dat psphotErrorCodes.h.in
-        $(PSLIB_DIR)/bin/psParseErrorCodes --data=errorCodes.dat --outdir=. \
-                                                psphotErrorCodes.h
+        $(ERRORCODES) --data=errorCodes.dat --outdir=. psphotErrorCodes.h
+
 errorCodes.c : errorCodes.dat errorCodes.c.in psphotErrorCodes.h
-        $(PSLIB_DIR)/bin/psParseErrorCodes --data=errorCodes.dat --outdir=. errorCodes.c
+        $(ERRORCODES) --data=errorCodes.dat --outdir=. errorCodes.c