Index: trunk/ippTools/src/Makefile.am
===================================================================
--- trunk/ippTools/src/Makefile.am	(revision 6209)
+++ trunk/ippTools/src/Makefile.am	(revision 6210)
@@ -1,13 +1,12 @@
-bin_PROGRAMS = p2search p2admin
+bin_PROGRAMS = p2search pxadmin
 
-include_HEADERS = p2tools.h
-lib_LTLIBRARIES = libp2tools.la
-libp2tools_la_CFLAGS	= $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(METADATADB_CFLAGS) $(p2tools_CFLAGS)
-libp2tools_la_LIBS      = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(METADATADB_LIBS)
-libp2tools_la_LDFLAGS   = -release $(PACKAGE_VERSION)
-libp2tools_la_SOURCES   = \
+include_HEADERS = pxtools.h
+lib_LTLIBRARIES = libpxtools.la
+libpxtools_la_CFLAGS	= $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(METADATADB_CFLAGS) $(pxtools_CFLAGS)
+libpxtools_la_LIBS      = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(METADATADB_LIBS)
+libpxtools_la_LDFLAGS   = -release $(PACKAGE_VERSION)
+libpxtools_la_SOURCES   = \
     p2searchDoneFrames.c \
-    p2adminTables.c \
-    p2alloc.c \
+    pxalloc.c \
     p2insertDoneFrames.c \
     p2insertPendingFrames.c \
@@ -17,20 +16,21 @@
     p2searchRawFrames.c \
     p2updatePending.c \
-    p2writePendingFrames.c
+    p2writePendingFrames.c \
+    pxtables.c
 
 
-# for p2tools.h
+# for pxtools.h
 AM_CPPFLAGS = -I$(top_srcdir)/src$
 
-p2search_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(METADATADB_CFLAGS) $(p2tools_CFLAGS)
-p2search_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(METADATADB_LIBS) $(top_builddir)/src/libp2tools.la
+p2search_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(METADATADB_CFLAGS) $(pxtools_CFLAGS)
+p2search_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(METADATADB_LIBS) $(top_builddir)/src/libpxtools.la
 p2search_SOURCES = \
     p2search.c \
     p2searchConfig.c
-p2admin_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(METADATADB_CFLAGS) $(p2tools_CFLAGS)
-p2admin_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(METADATADB_LIBS) $(top_builddir)/src/libp2tools.la
-p2admin_SOURCES = \
-    p2admin.c \
-    p2adminConfig.c
+pxadmin_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(METADATADB_CFLAGS) $(pxtools_CFLAGS)
+pxadmin_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(METADATADB_LIBS) $(top_builddir)/src/libpxtools.la
+pxadmin_SOURCES = \
+    pxadmin.c \
+    pxadminConfig.c
 
 clean-local: