From 649ce407193daadac07d7c0d5e91b74f1574cd30 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 16 Dec 2009 04:16:39 +0000 Subject: * gcc4.4 compilation fixes * automake updates git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1062803 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kmtrace/Makefile.am | 6 ++++-- kmtrace/README | 4 ++-- kmtrace/configure.in.in | 2 +- kmtrace/kminspector.in | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) (limited to 'kmtrace') diff --git a/kmtrace/Makefile.am b/kmtrace/Makefile.am index 68fce88d..3d721ac6 100644 --- a/kmtrace/Makefile.am +++ b/kmtrace/Makefile.am @@ -33,13 +33,15 @@ kmmatch_LDFLAGS = $(all_libraries) bin_SCRIPTS = kminspector -lib_LIBRARIES = libktrace_s.a +kmtracelibdir = $(libdir)/kmtrace + +kmtracelib_LIBRARIES = libktrace_s.a libktrace_s_a_SOURCES = ktrace_s.c ktrace_s.c: $(srcdir)/ktrace.c $(LN_S) $(srcdir)/ktrace.c $@ -lib_LTLIBRARIES = libktrace.la +kmtracelib_LTLIBRARIES = libktrace.la libktrace_la_LDFLAGS = -avoid-version libktrace_la_SOURCES = ksotrace.cpp ktrace.c libktrace_la_LIBADD = $(LIBDL) diff --git a/kmtrace/README b/kmtrace/README index 63e35228..2e6beb17 100644 --- a/kmtrace/README +++ b/kmtrace/README @@ -23,7 +23,7 @@ friends. You can activate malloc logging by starting yourApplication as: - MALLOC_TRACE=/tmp/ktrace.out LD_PRELOAD=$KDEDIR/lib/libktrace.so yourApplication + MALLOC_TRACE=/tmp/ktrace.out LD_PRELOAD=/usr/lib/kmtrace/libktrace.so yourApplication 2) The manual way @@ -37,7 +37,7 @@ Add as first statement in main(): Add ktrace_s.a to the LDADD line in your Makefile.am like: - kicker_LDADD = kicker.la /opt/kde/lib/libktrace_s.a + kicker_LDADD = kicker.la /usr/lib/kmtrace/libktrace_s.a Note that the static library is used. You can now activate malloc logging by starting yourApplication as: diff --git a/kmtrace/configure.in.in b/kmtrace/configure.in.in index 5df3711e..6270df4e 100644 --- a/kmtrace/configure.in.in +++ b/kmtrace/configure.in.in @@ -1,7 +1,7 @@ dnl AC_OUTPUT( kmtrace/kminspector ) case "$host" in - *-gnu) + *-gnu*) saved_LIBS="$LIBS" LIBS="$LIBS -Wl,-Bstatic -liberty -Wl,-Bdynamic" AC_TRY_LINK([], [], [kde_compile_kmtrace=$GCC], [kde_compile_kmtrace=no]) diff --git a/kmtrace/kminspector.in b/kmtrace/kminspector.in index 572ed200..4d2e2042 100755 --- a/kmtrace/kminspector.in +++ b/kmtrace/kminspector.in @@ -2,7 +2,7 @@ export MALLOC_TREE=kminspector.tree export MALLOC_THRESHOLD=2000 -export LD_PRELOAD=@kde_libraries@/libktrace.so +export LD_PRELOAD=@kde_libraries@/kmtrace/libktrace.so $* -- cgit v1.2.3