- Removed ccmalloc stuff. Now using valgrind

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

11 files changed, 54 insertions, 24 deletions

diff --git a/conf/configure.in.in b/conf/configure.in.in
index 87d0674..4ce76b2 100644
--- a/conf/configure.in.in
+++ b/conf/configure.in.in
@@ -265,6 +265,11 @@ AC_ARG_WITH(initdir,
 )
 AC_SUBST(initdir)
 
+LIB_PLP='$(top_builddir)/lib/libplp.la'
+AC_SUBST(LIB_PLP)
+PLP_LDFLAGS='-L$(top_builddir)/lib/.libs'
+AC_SUBST(PLP_LDFLAGS)
+
 dnl KDE stuff
 PLP_HELP_MSG([Options for activating sub packages:])
 ac_enable_kde=no
diff --git a/etc/plptools.spec.in b/etc/plptools.spec.in
index 1b67add..ae0dd54 100644
--- a/etc/plptools.spec.in
+++ b/etc/plptools.spec.in
@@ -48,7 +48,15 @@
 %define _kdelibdir %{_kdedir}/lib
 %define _kdedatadir %{_kdedir}/share
 %define realrelease %{myrelease}%{distro}
+
+#
+# Conditionals
+#
 %{?_without_distro: %define realrelease %{myrelease}}
+%{?_with_debug: %define __spec_install_post /usr/lib/rpm/brp-compress}
+%{?_with_debug: %define _with_debug --enable-debug}
+%{?_with_debug: %define optflags -g}
+%{!?_with_debug: %define _with_debug --disable-debug}
 
 Summary: Connectivity for psion series 5.
 Name: plptools
@@ -63,7 +71,6 @@ Group: Networking/Utilities
 Buildrequires: readline-devel newt-devel kdelibs-devel >= 2.1
 %if "%{isSUSE}" > "0"
 %if "%{REL}" >= "8.0"
-# aaa_base provides chkconfig
 Requires: aaa_base >= 2002.3.27-0
 %else
 Requires: aaa_base >= 2001.10.19-1
@@ -184,15 +191,37 @@ zwischen Psion und Rechner.
 
 %prep
 %setup -q
+%if "%{isSUSE}" > "0"
+# SuSE's depencies are pretty broken. Example: For the KDE stuff,
+# RPM's automatic find-requires generates a depency to libGLcore
+# if the build-system has Nvidia drivers installed. Our KDE stuff
+# definitively does NOT depend on it!
+# Therefore, we filter some unnecessary stuff out:
+cat<<EOF>find-requires
+#!/bin/sh
+%{__find_requires} "$@" |egrep -v 'libGL|freetype|libfam'
+EOF
+chmod a+x find-requires
+%define __find_requires %{_builddir}/%{buildsubdir}/find-requires
+%endif
+%if "%{isMDK}" > "0"
+# Mandrake's RPM generates similar odd depencies.
+cat<<EOF>find-requires
+#!/bin/sh
+%{__find_requires} "$@" |egrep -v 'libGL|freetype'
+EOF
+chmod a+x find-requires
+%define __find_requires %{_builddir}/%{buildsubdir}/find-requires
+%endif
 
 %build
 %if "%{isSUSE}" > "0"
 # SuSE's libtools are breaking everything
 %define __libtoolize true
 %if "%{REL}" >= "8.0"
-%configure --enable-kde --with-initdir=%{_initrddir} --with-kdedir=/opt/kde3
+%configure --enable-kde --with-initdir=%{_initrddir} --with-kdedir=/opt/kde3 %{_with_debug}
 %else
-%configure --enable-kde --with-initdir=%{_initrddir} --with-kdedir=/opt/kde2
+%configure --enable-kde --with-initdir=%{_initrddir} --with-kdedir=/opt/kde2 %{_with_debug}
 %endif
 %endif
 %if "%{isMDK}" > "0"
@@ -203,7 +232,7 @@ zwischen Psion und Rechner.
 %endif
 %if "%{isRH}" > "0"
 QD=%{_qtdir}
-%configure --enable-kde $QD --with-initdir=%{_initrddir}
+%configure --enable-kde $QD --with-initdir=%{_initrddir} %{_with_debug}
 %endif
 make
 
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
diff --git a/ncpd/Makefile.am b/ncpd/Makefile.am
index 0338e97..e09a323 100644
--- a/ncpd/Makefile.am
+++ b/ncpd/Makefile.am
@@ -6,7 +6,7 @@ CXXFLAGS = $(THREADED_CXXFLAGS)
 
 sbin_PROGRAMS = ncpd
 
-ncpd_LDADD = $(top_srcdir)/lib/libplp.la -lpthread
+ncpd_LDADD = $(LIB_PLP) -lpthread
 ncpd_SOURCES = channel.cc link.cc linkchan.cc main.cc \
 	ncp.cc packet.cc socketchan.cc mp_serial.c
 EXTRA_DIST = channel.h link.h linkchan.h main.h mp_serial.h ncp.h packet.h \
diff --git a/plpbackup/Makefile.am b/plpbackup/Makefile.am
index a1a859b..3589fc0 100644
--- a/plpbackup/Makefile.am
+++ b/plpbackup/Makefile.am
@@ -3,7 +3,7 @@
 INCLUDES=-I$(top_srcdir)/lib
 
 bin_PROGRAMS = plpbackup
-plpbackup_LDADD = $(top_srcdir)/lib/libplp.la
+plpbackup_LDADD = $(LIB_PLP)
 plpbackup_SOURCES = plpbackup.cc
 
 maintainer-clean-local:
diff --git a/plpftp/Makefile.am b/plpftp/Makefile.am
index 8c5addc..c111fe8 100644
--- a/plpftp/Makefile.am
+++ b/plpftp/Makefile.am
@@ -3,7 +3,7 @@
 INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/intl
 
 bin_PROGRAMS = plpftp
-plpftp_LDADD = $(top_srcdir)/lib/libplp.la $(LIBREADLINE) $(LIBHISTORY) $(INTLLIBS)
+plpftp_LDADD = $(LIB_PLP) $(LIBREADLINE) $(LIBHISTORY) $(INTLLIBS)
 plpftp_SOURCES = ftp.cc main.cc rlcrap.c
 EXTRA_DIST = ftp.h rlcrap.h
 
diff --git a/plpnfsd/Makefile.am b/plpnfsd/Makefile.am
index 998b109..3ab7879 100644
--- a/plpnfsd/Makefile.am
+++ b/plpnfsd/Makefile.am
@@ -3,7 +3,7 @@
 INCLUDES=-I$(top_srcdir)/lib
 
 sbin_PROGRAMS = plpnfsd
-plpnfsd_LDADD = $(top_srcdir)/lib/libplp.la
+plpnfsd_LDADD = $(LIB_PLP)
 plpnfsd_SOURCES = mp_main.c mp_mount.c nfs_prot_svc.c nfs_prot_xdr.c \
 	mp_pfs_ops.c mp_inode.c main.cc
 
diff --git a/plpprint/Makefile.am b/plpprint/Makefile.am
index 3cde22f..fca5158 100644
--- a/plpprint/Makefile.am
+++ b/plpprint/Makefile.am
@@ -3,7 +3,7 @@
 INCLUDES=-I$(top_srcdir)/lib
 
 sbin_PROGRAMS = plpprintd
-plpprintd_LDADD = $(top_srcdir)/lib/libplp.la
+plpprintd_LDADD = $(LIB_PLP)
 plpprintd_SOURCES = plpprintd.cc
 
 EXTRA_DIST = prolog.ps.in fontmap