- Removed ccmalloc stuff. Now using valgrind

 - Cleanup of LDFLAGS for less depencies
 - Added workaround specfile for broken Autoreq on SuSE and Mandrake

4 files changed, 11 insertions, 15 deletions

diff --git a/kde2/kioslave/Makefile.am b/kde2/kioslave/Makefile.am
index f306934..94cb47b 100644
--- a/kde2/kioslave/Makefile.am
+++ b/kde2/kioslave/Makefile.am
@@ -4,16 +4,13 @@ maintainer-clean-local:
 	rm -f Makefile.in
 
 INCLUDES = $(all_includes) -I$(top_srcdir)/lib
-LDFLAGS  = $(all_libraries) $(KDE_RPATH)
 
 kdemoduledir = $(kde_moduledir)
 kdemodule_LTLIBRARIES = kio_plp.la
 
-kio_plp_la_LDFLAGS = -module $(KDE_PLUGIN)
-
 kio_plp_la_SOURCES = kio_plp.cpp
-kio_plp_la_LIBADD = -L$(top_srcdir)/lib/.libs $(top_srcdir)/lib/libplp.la \
-	$(LIB_KIO)
+kio_plp_la_LIBADD = $(LIB_PLP) $(LIB_KIO)
+kio_plp_la_LDFLAGS = $(PLP_LDFLAGS) $(KDE_LDFLAGS) $(LIBDEBUG) -module $(KDE_PLUGIN)
 
 noinst_HEADERS = kio_plp.h
 
diff --git a/kde2/klipsi/Makefile.am b/kde2/klipsi/Makefile.am
index 21e035f..f502759 100644
--- a/kde2/klipsi/Makefile.am
+++ b/kde2/klipsi/Makefile.am
@@ -18,13 +18,13 @@ lib_LTLIBRARIES = klipsi.la
 
 CLEANFILES = dummy.cpp
 
-klipsi_la_LIBADD = -L$(top_srcdir)/lib/.libs $(top_srcdir)/lib/libplp.la $(LIB_KDEUI)
+klipsi_la_LIBADD = $(LIB_PLP) $(LIB_KDEUI)
 klipsi_la_SOURCES = main.cpp toplevel.cpp
-klipsi_la_LDFLAGS = $(all_libraries) -module -avoid-version
+klipsi_la_LDFLAGS = $(PLP_LDFLAGS) $(KDE_LDFLAGS) $(LIBDEBUG) -module $(KDE_MODULE)
 
 klipsi_LDADD = klipsi.la
 klipsi_SOURCES = dummy.cpp
-klipsi_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+klipsi_LDFLAGS = $(KDE_RPATH)
 
 
 applnkdir = $(kde_appsdir)/Utilities
diff --git a/kde2/kpsion/Makefile.am b/kde2/kpsion/Makefile.am
index 5c7550b..6b57976 100644
--- a/kde2/kpsion/Makefile.am
+++ b/kde2/kpsion/Makefile.am
@@ -18,16 +18,16 @@ DISTCLEANFILES = $(kpsion_METASOURCES) ./.deps/* ./.deps/.P
 lib_LTLIBRARIES = libkpsion.la
 bin_PROGRAMS	= kpsion
 
-libkpsion_la_LDFLAGS = $(LIBDEBUG) $(all_libraries) -module -avoid-version
+libkpsion_la_LDFLAGS = $(PLP_LDFLAGS) $(KDE_LDFLAGS) $(LIBDEBUG) $(KDE_MODULE)
 libkpsion_la_SOURCES = kpsion.cpp setupdialog.cpp wizards.cpp \
 	statusbarprogress.cpp kpsionconfig.cpp kpsionbackuplistview.cpp \
 	kpsionrestoredialog.cpp
 
-libkpsion_la_LIBADD = -L$(top_srcdir)/lib/.libs $(top_srcdir)/lib/libplp.la $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(LIB_KFILE) $(LIB_QT)
+libkpsion_la_LIBADD = $(LIB_PLP) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(LIB_KFILE) $(LIB_QT)
 
 kpsion_SOURCES	= main.cpp
 kpsion_LDFLAGS  = $(KDE_RPATH)
-kpsion_LDADD	= libkpsion.la $(top_srcdir)/lib/libplp.la $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(LIB_KFILE) $(LIB_QT)
+kpsion_LDADD	= libkpsion.la $(LIB_PLP) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(LIB_KFILE) $(LIB_QT)
 
 applnk_DATA = kpsion.desktop
 applnkdir = $(kde_appsdir)/Utilities
diff --git a/kde2/plugins/Makefile.am b/kde2/plugins/Makefile.am
index e0cfb82..ab12d54 100644
--- a/kde2/plugins/Makefile.am
+++ b/kde2/plugins/Makefile.am
@@ -1,17 +1,16 @@
 
 INCLUDES = $(all_includes) -I$(top_srcdir)/lib
-LDFLAGS  = $(all_libraries)
 
 kdemoduledir = $(kde_moduledir)
 kdemodule_LTLIBRARIES = libplpprops.la
 
-libplpprops_la_LDFLAGS = $(LIBDEBUG) $(all_libraries) $(KDE_PLUGIN)
-
 METASOURCES = AUTO
 
 libplpprops_la_SOURCES = plpprops.cc plppropsFactory.cc pie3dpiece.cpp \
 	pie3dwidget.cpp
-libplpprops_la_LIBADD = -L$(top_srcdir)/lib/.libs $(top_srcdir)/lib/libplp.la $(LIB_KIO) $(LIB_KFILE)
+libplpprops_la_LIBADD = $(LIB_PLP) $(LIB_KIO) $(LIB_KFILE)
+libplpprops_la_LDFLAGS = $(PLP_LDFLAGS) $(KDE_LDFLAGS) $(LIBDEBUG) $(KDE_PLUGIN)
+
 noinst_HEADERS = plpprops.h plppropsFactory.h pie3dpiece.h pie3dwidget.h
 
 services_DATA = plpprops.desktop