Index: /trunk/ippTools/src/Makefile.am
===================================================================
--- /trunk/ippTools/src/Makefile.am	(revision 6057)
+++ /trunk/ippTools/src/Makefile.am	(revision 6058)
@@ -1,7 +1,23 @@
-bin_PROGRAMS = p2tools
+bin_PROGRAMS = p2search p2admin
 
-p2tools_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(METADATADB_CFLAGS) $(p2tools_CFLAGS)
-p2tools_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(METADATADB_LIBS)
-p2tools_SOURCES = \
+p2search_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(METADATADB_CFLAGS) $(p2tools_CFLAGS)
+p2search_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(METADATADB_LIBS)
+p2search_SOURCES = \
+    p2alloc.c \
+    p2insertDoneFrames.c \
+    p2insertPendingFrames.c \
+    p2pendingToDone.c \
+    p2rawToPending.c \
+    p2search.c \
+    p2searchConfig.c \
+    p2searchPendingFrames.c \
+    p2searchRawFrames.c \
+    p2updatePending.c \
+    p2writePendingFrames.c
+
+p2admin_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(METADATADB_CFLAGS) $(p2tools_CFLAGS)
+p2admin_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(METADATADB_LIBS)
+p2admin_SOURCES = \
+    p2alloc.c \
     p2admin.c \
     p2adminConfig.c \
@@ -11,9 +27,4 @@
     p2pendingToDone.c \
     p2rawToPending.c \
-    p2search.c \
-    p2search.h \
-    p2searchConfig.c \
-    p2searchPendingFrames.c \
-    p2searchRawFrames.c \
     p2updatePending.c \
     p2writePendingFrames.c