--- oprofile-0.9.2/libutil/Makefile.am.libs	2003-09-26 09:23:32.000000000 -0400
+++ oprofile-0.9.2/libutil/Makefile.am	2006-09-18 10:20:33.000000000 -0400
@@ -2,8 +2,8 @@
 
 AM_CFLAGS = @OP_CFLAGS@
 
-noinst_LIBRARIES = libutil.a
-libutil_a_SOURCES = \
+noinst_LIBRARIES = liboputil.a
+liboputil_a_SOURCES = \
 	op_deviceio.c \
 	op_lockfile.c \
 	op_file.c \
--- oprofile-0.9.2/libabi/tests/Makefile.am.libs	2005-08-04 14:27:28.000000000 -0400
+++ oprofile-0.9.2/libabi/tests/Makefile.am	2006-09-18 10:27:20.000000000 -0400
@@ -13,9 +13,9 @@
 
 abi_test_SOURCES = abi_test.cpp
 abi_test_LDADD = \
-	../libabi.a \
+	../libopabi.a \
 	../../libop/libop.a \
 	../../libdb/libodb.a \
 	../../libopt++/libopt++.a \
-	../../libutil++/libutil++.a \
-	../../libutil/libutil.a
+	../../libutil++/liboputil++.a \
+	../../libutil/liboputil.a
--- oprofile-0.9.2/libabi/Makefile.am.libs	2005-08-04 14:27:27.000000000 -0400
+++ oprofile-0.9.2/libabi/Makefile.am	2006-09-18 10:28:31.000000000 -0400
@@ -10,15 +10,15 @@
 
 AM_CXXFLAGS = @OP_CXXFLAGS@
 
-noinst_LIBRARIES = libabi.a
-libabi_a_SOURCES = abi.cpp abi.h op_abi.c op_abi.h
+noinst_LIBRARIES = libopabi.a
+libopabi_a_SOURCES = abi.cpp abi.h op_abi.c op_abi.h
 
 bin_PROGRAMS = opimport
 
 opimport_SOURCES = opimport.cpp
 opimport_LDADD = \
-	libabi.a \
+	libopabi.a \
 	../libdb/libodb.a \
 	../libopt++/libopt++.a \
-	../libutil++/libutil++.a \
-	../libutil/libutil.a
+	../libutil++/liboputil++.a \
+	../libutil/liboputil.a
--- oprofile-0.9.2/pp/Makefile.am.libs	2005-04-04 18:34:41.000000000 -0400
+++ oprofile-0.9.2/pp/Makefile.am	2006-09-18 10:20:33.000000000 -0400
@@ -19,9 +19,9 @@
 	../libpp/libpp.a \
 	../libopt++/libopt++.a \
 	../libregex/libop_regex.a \
-	../libutil++/libutil++.a \
+	../libutil++/liboputil++.a \
 	../libop/libop.a \
-	../libutil/libutil.a \
+	../libutil/liboputil.a \
 	../libdb/libodb.a
 
 opreport_SOURCES = opreport.cpp \
--- oprofile-0.9.2/utils/Makefile.am.libs	2005-03-31 12:20:41.000000000 -0500
+++ oprofile-0.9.2/utils/Makefile.am	2006-09-18 10:20:33.000000000 -0400
@@ -7,4 +7,4 @@
 dist_bin_SCRIPTS = opcontrol
 
 ophelp_SOURCES = ophelp.c
-ophelp_LDADD = ../libop/libop.a ../libutil/libutil.a
+ophelp_LDADD = ../libop/libop.a ../libutil/liboputil.a
--- oprofile-0.9.2/gui/Makefile.am.libs	2003-11-06 14:45:54.000000000 -0500
+++ oprofile-0.9.2/gui/Makefile.am	2006-09-18 10:20:33.000000000 -0400
@@ -26,9 +26,9 @@
 oprof_start_SOURCES = $(dist_sources)
 nodist_oprof_start_SOURCES = oprof_start.moc.cpp
 oprof_start_LDADD = \
-	../libutil++/libutil++.a \
+	../libutil++/liboputil++.a \
 	../libop/libop.a \
-	../libutil/libutil.a \
+	../libutil/liboputil.a \
 	ui/liboprof_start.a \
 	@QT_LDFLAGS@ \
 	@QT_LIB@ \
--- oprofile-0.9.2/libutil++/Makefile.am.libs	2005-04-22 15:29:21.000000000 -0400
+++ oprofile-0.9.2/libutil++/Makefile.am	2006-09-18 10:20:33.000000000 -0400
@@ -5,8 +5,8 @@
 	-I ${top_srcdir}/libop
 AM_CXXFLAGS = @OP_CXXFLAGS@
 
-noinst_LIBRARIES = libutil++.a
-libutil___a_SOURCES = \
+noinst_LIBRARIES = liboputil++.a
+liboputil___a_SOURCES = \
 	op_bfd.cpp \
 	op_bfd.h \
 	bfd_support.cpp \
--- oprofile-0.9.2/daemon/Makefile.am.libs	2005-08-04 14:27:26.000000000 -0400
+++ oprofile-0.9.2/daemon/Makefile.am	2006-09-18 10:25:46.000000000 -0400
@@ -40,9 +40,9 @@
 
 oprofiled_LDADD = \
 	liblegacy/liblegacy.a \
-	../libabi/libabi.a \
+	../libabi/libopabi.a \
 	../libdb/libodb.a \
 	../libop/libop.a \
-	../libutil/libutil.a
+	../libutil/liboputil.a
 
 oprofiled_LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@