Index: /trunk/ippTools/src/Makefile.am
===================================================================
--- /trunk/ippTools/src/Makefile.am	(revision 6208)
+++ /trunk/ippTools/src/Makefile.am	(revision 6209)
@@ -1,7 +1,12 @@
 bin_PROGRAMS = p2search p2admin
 
-p2search_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(METADATADB_CFLAGS) $(p2tools_CFLAGS)
-p2search_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(METADATADB_LIBS)
-p2search_SOURCES = \
+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   = \
+    p2searchDoneFrames.c \
+    p2adminTables.c \
     p2alloc.c \
     p2insertDoneFrames.c \
@@ -9,7 +14,4 @@
     p2pendingToDone.c \
     p2rawToPending.c \
-    p2search.c \
-    p2searchConfig.c \
-	p2searchDoneFrames.c \
     p2searchPendingFrames.c \
     p2searchRawFrames.c \
@@ -17,20 +19,18 @@
     p2writePendingFrames.c
 
-p2admin_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(METADATADB_CFLAGS) $(p2tools_CFLAGS)
-p2admin_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(METADATADB_LIBS)
+
+# for p2tools.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_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 = \
-    p2alloc.c \
     p2admin.c \
-    p2adminConfig.c \
-    p2adminTables.c \
-    p2insertDoneFrames.c \
-    p2insertPendingFrames.c \
-    p2pendingToDone.c \
-    p2rawToPending.c \
-    p2updatePending.c \
-    p2writePendingFrames.c
-
-noinst_HEADERS = \
-	p2tools.h
+    p2adminConfig.c
 
 clean-local: