Changeset 11335

Timestamp:

Jan 26, 2007, 4:31:50 PM (19 years ago)

Author:

jhoblitt

Message:

rollback "cleanup use of pkg-config discovered packages"

Location:

trunk/ippTools

Files:

• configure.ac (modified) (2 diffs)
• src/Makefile.am (modified) (2 diffs)

trunk/ippTools/configure.ac

@@ -14 +14 @@
 AC_PROG_LIBTOOL
 
-PKG_CHECK_MODULES([DEPS],
-    [pslib >= 0.12.99
-    psmodules >= 0.12.0
-    ippdb >= 0.0.78]) 
+PKG_CHECK_MODULES([PSLIB], [pslib >= 0.12.99]) 
+PKG_CHECK_MODULES([PSMODULES], [psmodules >= 0.12.0]) 
+PKG_CHECK_MODULES([IPPDB], [ippdb >= 0.0.78]) 
 
-PXTOOLS_CFLAGS="${DEPS_CFLAGS=}"
-PXTOOLS_LIBS="${DEPS_LIBS=}" 
+PXTOOLS_CFLAGS="${PSLIB_CFLAGS=} ${PSMODULES_CFLAGS=} ${IPPDB_CFLAGS=}"
+PXTOOLS_LIBS="${PSLIB_LIBS=} ${PSMODULES_LIBS=} ${IPPDB_LIBS=}"
+AC_SUBST(PXTOOLS_CFLAGS,[$PXTOOLS_CFLAGS])
+AC_SUBST(PXTOOLS_LIBS,[$PXTOOLS_LIBS])
 
 dnl check for PSDB support
 TMP_CFLAGS=${CFLAGS}
-CFLAGS="${CFLAGS=} ${PXTOOLS_CFLAGS}"
+CFLAGS="${CFLAGS=} ${PSLIB_CFLAGS}"
 
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
@@ -69 +70 @@
 )
 
-CFLAGS="${CFLAGS} -Wall -Werror -std=c99"
-
-AC_SUBST(PXTOOLS_CFLAGS, [$PXTOOLS_CFLAGS])
-AC_SUBST(PXTOOLS_LIBS, [$PXTOOLS_LIBS])
+pxtools_CFLAGS="-Wall -Werror -std=c99"
+AC_SUBST([pxtools_CFLAGS])
 
 AC_CONFIG_FILES([

trunk/ippTools/src/Makefile.am

@@ -31 +31 @@
 
 lib_LTLIBRARIES = libpxtools.la
-libpxtools_la_CFLAGS    = $(PXTOOLS_CFLAGS)
-libpxtools_la_LIBS      = $(PXTOOLS_LIBS) 
+libpxtools_la_CFLAGS    = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) $(pxtools_CFLAGS)
+libpxtools_la_LIBS      = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS)
 libpxtools_la_LDFLAGS   = -release $(PACKAGE_VERSION)
 libpxtools_la_SOURCES   = \
@@ -45 +45 @@
 AM_CPPFLAGS = -I$(top_srcdir)/src$
 
-pztool_CFLAGS  = $(PXTOOLS_CFLAGS)
-pztool_LDADD   = $(PXTOOLS_LIBS) libpxtools.la
+pztool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) $(pxtools_CFLAGS)
+pztool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
 pztool_SOURCES = \
     pztool.c \
     pztoolConfig.c
 
-p0tool_CFLAGS  = $(PXTOOLS_CFLAGS)
-p0tool_LDADD   = $(PXTOOLS_LIBS) libpxtools.la
+p0tool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) $(pxtools_CFLAGS)
+p0tool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
 p0tool_SOURCES = \
     p0tool.c \
     p0toolConfig.c
 
-p1tool_CFLAGS  = $(PXTOOLS_CFLAGS)
-p1tool_LDADD   = $(PXTOOLS_LIBS) libpxtools.la
+p1tool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) $(pxtools_CFLAGS)
+p1tool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
 p1tool_SOURCES = \
     p1tool.c \
     p1toolConfig.c
 
-p2tool_CFLAGS  = $(PXTOOLS_CFLAGS) 
-p2tool_LDADD   = $(PXTOOLS_LIBS) libpxtools.la
+p2tool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) $(pxtools_CFLAGS)
+p2tool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
 p2tool_SOURCES = \
     p2tool.c \
     p2toolConfig.c
 
-p3tool_CFLAGS  = $(PXTOOLS_CFLAGS)
-p3tool_LDADD   = $(PXTOOLS_LIBS) libpxtools.la
+p3tool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) $(pxtools_CFLAGS)
+p3tool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
 p3tool_SOURCES = \
     p3tool.c \
     p3toolConfig.c
 
-p4tool_CFLAGS  = $(PXTOOLS_CFLAGS)
-p4tool_LDADD   = $(PXTOOLS_LIBS) libpxtools.la
+p4tool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) $(pxtools_CFLAGS)
+p4tool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
 p4tool_SOURCES = \
     p4tool.c \
     p4toolConfig.c
 
-pxadmin_CFLAGS  = $(PXTOOLS_CFLAGS)
-pxadmin_LDADD   = $(PXTOOLS_LIBS) libpxtools.la
+pxadmin_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) $(pxtools_CFLAGS)
+pxadmin_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
 pxadmin_SOURCES = \
     pxadmin.c \
     pxadminConfig.c
 
-pzgetexp_CFLAGS  = $(PXTOOLS_CFLAGS)
-pzgetexp_LDADD   = $(PXTOOLS_LIBS) libpxtools.la
+pzgetexp_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) $(pxtools_CFLAGS)
+pzgetexp_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
 pzgetexp_SOURCES = \
     pzgetexp.c \
     pzgetexpConfig.c
 
-pzgetimfiles_CFLAGS  = $(PXTOOLS_CFLAGS)
-pzgetimfiles_LDADD   = $(PXTOOLS_LIBS) libpxtools.la
+pzgetimfiles_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) $(pxtools_CFLAGS)
+pzgetimfiles_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
 pzgetimfiles_SOURCES = \
     pzgetimfiles.c \
     pzgetimfilesConfig.c
 
-dettool_CFLAGS  = $(PXTOOLS_CFLAGS)
-dettool_LDADD   = $(PXTOOLS_LIBS) libpxtools.la
+dettool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) $(pxtools_CFLAGS)
+dettool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
 dettool_SOURCES = \
     dettool.c \
     dettoolConfig.c
 
-detselect_CFLAGS  = $(PXTOOLS_CFLAGS)
-detselect_LDADD   = $(PXTOOLS_LIBS) libpxtools.la
+detselect_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) $(pxtools_CFLAGS)
+detselect_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
 detselect_SOURCES = \
     detselect.c \
     detselectConfig.c
 
-pxinject_CFLAGS  = $(PXTOOLS_CFLAGS)
-pxinject_LDADD   = $(PXTOOLS_LIBS) libpxtools.la
+pxinject_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) $(pxtools_CFLAGS)
+pxinject_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
 pxinject_SOURCES = \
     pxinject.c \