Changeset 33031

Timestamp:

Dec 27, 2011, 3:36:21 PM (14 years ago)

Author:

heather

Message:

svn merge didn't want to compile mergetool

File:

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

trunk/ippTools/src/Makefile.am

@@ -29 +29 @@
         diffphottool \
         minidvodbtool \
+        mergetool \
         laptool \
         vptool
@@ -43 +44 @@
         pxmagic.h \
         pxminidvodb.h \
+        pxmerge.h \
         pxregister.h \
         pxspace.h \
@@ -79 +81 @@
         diffphottool.h \
         minidvodbtool.h \
+        mergetool.h \
         laptool.h \
         vptool.h
@@ -98 +101 @@
         pxmagic.c \
         pxminidvodb.c \
+        pxmerge.c \
         pxregister.c \
         pxspace.c \
@@ -294 +298 @@
     minidvodbtoolConfig.c
 
+mergetool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
+mergetool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
+mergetool_SOURCES = \
+    mergetool.c \
+    mergetoolConfig.c
+
 laptool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
 laptool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la