Changeset 28484 for branches/pap/ippTools/src/Makefile.am

Timestamp:

Jun 24, 2010, 2:59:09 PM (16 years ago)

Author:

Paul Price

Message:

Merging trunk in advance of reintegrating into trunk.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• ippTools/src (modified) (1 prop)
• ippTools/src/Makefile.am (modified) (3 diffs)

branches/pap/ippTools/src

@@ -39 +39 @@
 warptool
 staticskytool
-
 bgtool
+diffphottool

@@ -39 +39 @@
 warptool
 staticskytool
-
 bgtool
+diffphottool

branches/pap/ippTools/src/Makefile.am

@@ -26 +26 @@
         warptool \
         receivetool \
-        pubtool
+        pubtool \
+        diffphottool
 
 pkginclude_HEADERS = \
@@ -71 +72 @@
         staticskytool.h \
         warptool.h \
-        pubtool.h
+        pubtool.h \
+        diffphottool.h
 
 lib_LTLIBRARIES = libpxtools.la
@@ -272 +274 @@
     pubtoolConfig.c
 
+diffphottool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
+diffphottool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
+diffphottool_SOURCES = \
+    diffphottool.c \
+    diffphottoolConfig.c
+
 clean-local:
         -rm -f TAGS

@@ -39 +39 @@
 warptool
 staticskytool
-
 bgtool
+diffphottool