Changeset 25299 for trunk/ippTools/src/Makefile.am

Timestamp:

Sep 8, 2009, 5:32:55 PM (17 years ago)

Author:

watersc1

Message:

Merge my branch back into the trunk. This includes:

ipp_cleanup.pl : and associated edits to allow cleanup to work
burntool : updated to newest version, ipp_apply_burntool.pl modified to use persist=t options
ppImageBurntoolMask.c : masks region burntool identifies
psastro : allow selection of wcs header format
addtool : splits addstar step off from the camera stage

Location:

trunk

Files:

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

trunk/ippTools/src/Makefile.am

@@ -1 +1 @@
 bin_PROGRAMS = \
+        addtool \
         caltool \
         camtool \
@@ -28 +29 @@
 
 pkginclude_HEADERS = \
+        pxadd.h \
         pxadmin.h \
         pxcam.h \
@@ -42 +44 @@
 
 noinst_HEADERS = \
+        addtool.h \
         caltool.h \
         camtool.h \
@@ -68 +71 @@
 libpxtools_la_LDFLAGS   = -release $(PACKAGE_VERSION)
 libpxtools_la_SOURCES   = \
+        pxadd.c \
         pxcam.c \
         pxchip.c \
@@ -96 +100 @@
     pstamptool.c \
     pstamptoolConfig.c
+
+addtool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
+addtool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
+addtool_SOURCES = \
+    addtool.c \
+    addtoolConfig.c
 
 caltool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)