Index: trunk/ippTools/src/Makefile.am
===================================================================
--- trunk/ippTools/src/Makefile.am	(revision 33030)
+++ trunk/ippTools/src/Makefile.am	(revision 33031)
@@ -29,4 +29,5 @@
 	diffphottool \
 	minidvodbtool \
+	mergetool \
 	laptool \
 	vptool
@@ -43,4 +44,5 @@
 	pxmagic.h \
 	pxminidvodb.h \
+	pxmerge.h \
 	pxregister.h \
 	pxspace.h \
@@ -79,4 +81,5 @@
 	diffphottool.h \
 	minidvodbtool.h \
+	mergetool.h \
 	laptool.h \
 	vptool.h
@@ -98,4 +101,5 @@
 	pxmagic.c \
 	pxminidvodb.c \
+	pxmerge.c \
 	pxregister.c \
 	pxspace.c \
@@ -294,4 +298,10 @@
     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