Changeset 28486 for trunk/pstamp

Timestamp:

Jun 24, 2010, 3:02:57 PM (16 years ago)

Author:

Paul Price

Message:

Merging (reintegrating) branches/pap (background restoration).

Location:

trunk

Files:

• . (modified) (1 prop)
• pstamp (modified) (1 prop)
• pstamp/Makefile.am (modified) (1 diff)
• pstamp/configure.ac (modified) (2 diffs)
• pstamp/ppstamp.pc.in (copied) (copied from branches/pap/pstamp/ppstamp.pc.in )

trunk/pstamp

@@ -16 +16 @@
 ltmain.sh
 libtool
+ppstamp.pc

@@ -16 +16 @@
 ltmain.sh
 libtool
+ppstamp.pc

trunk/pstamp/Makefile.am

@@ -1 +1 @@
 SUBDIRS = src scripts
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA= ppstamp.pc
+
+EXTRA_DIST = \
+        ppstamp.pc.in
+
 CLEANFILES = *~ core core.*

trunk/pstamp/configure.ac

@@ -33 +33 @@
 IPP_STDOPTS
 CFLAGS="${CFLAGS} -Wall -Werror"
+PPSTAMP_CFLAGS="${PSLIB_CFLAGS=} ${PSMODULES_CFLAGS=}"
+PPSTAMP_LIBS="${PSLIB_LIBS=} ${PSMODULES_LIBS=}"
 echo "PPSTAMP_CFLAGS: $PPSTAMP_CFLAGS"
 echo "PPSTAMP_LIBS: $PPSTAMP_LIBS"
@@ -43 +45 @@
   src/Makefile
   scripts/Makefile
+  ppstamp.pc
 ])
 

@@ -16 +16 @@
 ltmain.sh
 libtool
+ppstamp.pc