Changeset 33638 for branches/eam_branches/ipp-20111122/ippTools/src/Makefile.am

Timestamp:

Mar 30, 2012, 2:49:37 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20111122/ippTools/src

Files:

• . (modified) (2 props)
• Makefile.am (modified) (5 diffs)

branches/eam_branches/ipp-20111122/ippTools/src

@@ -7 +7 @@
 Makefile.in
 addtool
+mergetool
 caltool
 camtool

@@ -7 +7 @@
 Makefile.in
 addtool
+mergetool
 caltool
 camtool

branches/eam_branches/ipp-20111122/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

@@ -7 +7 @@
 Makefile.in
 addtool
+mergetool
 caltool
 camtool