diff -up oprofile-0.9.5/daemon/Makefile.am.libs oprofile-0.9.5/daemon/Makefile.am
--- oprofile-0.9.5/daemon/Makefile.am.libs 2009-07-31 13:10:19.000000000 -0400
+++ oprofile-0.9.5/daemon/Makefile.am 2009-08-04 14:01:40.000000000 -0400
@@ -50,9 +50,9 @@ bin_PROGRAMS = oprofiled
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 $@
diff -up oprofile-0.9.5/gui/Makefile.am.libs oprofile-0.9.5/gui/Makefile.am
--- oprofile-0.9.5/gui/Makefile.am.libs 2009-07-31 13:10:18.000000000 -0400
+++ oprofile-0.9.5/gui/Makefile.am 2009-08-04 14:01:40.000000000 -0400
@@ -26,9 +26,9 @@ bin_PROGRAMS = oprof_start
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@ \
diff -up oprofile-0.9.5/libabi/Makefile.am.libs oprofile-0.9.5/libabi/Makefile.am
--- oprofile-0.9.5/libabi/Makefile.am.libs 2009-07-31 13:10:20.000000000 -0400
+++ oprofile-0.9.5/libabi/Makefile.am 2009-08-04 14:01:40.000000000 -0400
@@ -10,15 +10,15 @@ AM_CPPFLAGS = \
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
diff -up oprofile-0.9.5/libabi/tests/Makefile.am.libs oprofile-0.9.5/libabi/tests/Makefile.am
--- oprofile-0.9.5/libabi/tests/Makefile.am.libs 2009-07-31 13:10:20.000000000 -0400
+++ oprofile-0.9.5/libabi/tests/Makefile.am 2009-08-04 14:01:40.000000000 -0400
@@ -13,9 +13,9 @@ check_PROGRAMS = abi_test
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
diff -up oprofile-0.9.5/libutil/Makefile.am.libs oprofile-0.9.5/libutil/Makefile.am
--- oprofile-0.9.5/libutil/Makefile.am.libs 2009-07-31 13:10:19.000000000 -0400
+++ oprofile-0.9.5/libutil/Makefile.am 2009-08-04 14:05:32.000000000 -0400
@@ -3,8 +3,8 @@ SUBDIRS = . tests
AM_CPPFLAGS=-I ${top_srcdir}/libop
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 \
diff -up oprofile-0.9.5/libutil++/Makefile.am.libs oprofile-0.9.5/libutil++/Makefile.am
--- oprofile-0.9.5/libutil++/Makefile.am.libs 2009-07-31 13:10:19.000000000 -0400
+++ oprofile-0.9.5/libutil++/Makefile.am 2009-08-04 14:01:40.000000000 -0400
@@ -7,8 +7,8 @@ AM_CPPFLAGS= \
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 \
diff -up oprofile-0.9.5/opjitconv/Makefile.am.libs oprofile-0.9.5/opjitconv/Makefile.am
--- oprofile-0.9.5/opjitconv/Makefile.am.libs 2009-07-31 13:10:18.000000000 -0400
+++ oprofile-0.9.5/opjitconv/Makefile.am 2009-08-04 14:01:40.000000000 -0400
@@ -6,7 +6,7 @@ bin_PROGRAMS = opjitconv
LIBS = @BFD_LIBS@
needed_libs = \
- ../libutil/libutil.a
+ ../libutil/liboputil.a
opjitconv_LDADD = $(needed_libs)
diff -up oprofile-0.9.5/pp/Makefile.am.libs oprofile-0.9.5/pp/Makefile.am
--- oprofile-0.9.5/pp/Makefile.am.libs 2009-07-31 13:10:18.000000000 -0400
+++ oprofile-0.9.5/pp/Makefile.am 2009-08-04 14:01:40.000000000 -0400
@@ -19,9 +19,9 @@ common_libs = \
../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 \
diff -up oprofile-0.9.5/utils/Makefile.am.libs oprofile-0.9.5/utils/Makefile.am
--- oprofile-0.9.5/utils/Makefile.am.libs 2009-07-31 13:10:18.000000000 -0400
+++ oprofile-0.9.5/utils/Makefile.am 2009-08-04 14:01:40.000000000 -0400
@@ -7,4 +7,4 @@ bin_PROGRAMS = ophelp
dist_bin_SCRIPTS = opcontrol
ophelp_SOURCES = ophelp.c
-ophelp_LDADD = ../libop/libop.a ../libutil/libutil.a
+ophelp_LDADD = ../libop/libop.a ../libutil/liboputil.a