4 files changed, 13 insertions, 14 deletions
diff --git a/kde2/kioslave/Makefile.am b/kde2/kioslave/Makefile.am
index f0efa3a..f306934 100644
--- a/kde2/kioslave/Makefile.am
+++ b/kde2/kioslave/Makefile.am
@@ -1,19 +1,19 @@
 # $Id$
 
-libdir=$(kde_libraries)
-
 maintainer-clean-local:
 	rm -f Makefile.in
 
 INCLUDES = $(all_includes) -I$(top_srcdir)/lib
 LDFLAGS  = $(all_libraries) $(KDE_RPATH)
 
-kio_plp_la_LDFLAGS = -module -avoid-version
+kdemoduledir = $(kde_moduledir)
+kdemodule_LTLIBRARIES = kio_plp.la
 
-lib_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 = -L$(top_srcdir)/lib/.libs $(top_srcdir)/lib/libplp.la \
+	$(LIB_KIO)
 
 noinst_HEADERS = kio_plp.h
 
diff --git a/kde2/klipsi/Makefile.am b/kde2/klipsi/Makefile.am
index 1b5ac7b..21e035f 100644
--- a/kde2/klipsi/Makefile.am
+++ b/kde2/klipsi/Makefile.am
@@ -29,7 +29,7 @@ klipsi_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 
 applnkdir = $(kde_appsdir)/Utilities
 applnk_DATA = klipsi.desktop
-EXTRA_DIST += $(applnk_DATA)
+EXTRA_DIST = $(applnk_DATA)
 
 appsdir = $(kde_datadir)/klipsi
 apps_DATA = eventsrc
diff --git a/kde2/kpsion/Makefile.am b/kde2/kpsion/Makefile.am
index 51e748c..5c7550b 100644
--- a/kde2/kpsion/Makefile.am
+++ b/kde2/kpsion/Makefile.am
@@ -18,7 +18,7 @@ DISTCLEANFILES = $(kpsion_METASOURCES) ./.deps/* ./.deps/.P
 lib_LTLIBRARIES = libkpsion.la
 bin_PROGRAMS	= kpsion
 
-libkpsion_la_LDFLAGS = $(LIBDEBUG) $(all_libraries) -module -version-info $(LIBVERSION)
+libkpsion_la_LDFLAGS = $(LIBDEBUG) $(all_libraries) -module -avoid-version
 libkpsion_la_SOURCES = kpsion.cpp setupdialog.cpp wizards.cpp \
 	statusbarprogress.cpp kpsionconfig.cpp kpsionbackuplistview.cpp \
 	kpsionrestoredialog.cpp
@@ -31,7 +31,7 @@ kpsion_LDADD	= libkpsion.la $(top_srcdir)/lib/libplp.la $(LIB_KDECORE) $(LIB_KDE
 
 applnk_DATA = kpsion.desktop
 applnkdir = $(kde_appsdir)/Utilities
-EXTRA_DIST += kpsion.desktop
+EXTRA_DIST = kpsion.desktop
 
 rcdir = $(kde_datadir)/kpsion
 rc_DATA = kpsionui.rc
diff --git a/kde2/plugins/Makefile.am b/kde2/plugins/Makefile.am
index f8e20f7..e0cfb82 100644
--- a/kde2/plugins/Makefile.am
+++ b/kde2/plugins/Makefile.am
@@ -1,14 +1,13 @@
 
-libdir=$(kde_libraries)
-
 INCLUDES = $(all_includes) -I$(top_srcdir)/lib
 LDFLAGS  = $(all_libraries)
 
-libplpprops_la_LDFLAGS = $(LIBDEBUG) $(all_libraries) -module -no-undefined -version-info $(LIBVERSION)
+kdemoduledir = $(kde_moduledir)
+kdemodule_LTLIBRARIES = libplpprops.la
 
-METASOURCES = AUTO
+libplpprops_la_LDFLAGS = $(LIBDEBUG) $(all_libraries) $(KDE_PLUGIN)
 
-lib_LTLIBRARIES = libplpprops.la
+METASOURCES = AUTO
 
 libplpprops_la_SOURCES = plpprops.cc plppropsFactory.cc pie3dpiece.cpp \
 	pie3dwidget.cpp
@@ -17,7 +16,7 @@ noinst_HEADERS = plpprops.h plppropsFactory.h pie3dpiece.h pie3dwidget.h
 
 services_DATA = plpprops.desktop
 servicesdir = $(kde_servicesdir)
-EXTRA_DIST += $(services_DATA)
+EXTRA_DIST = $(services_DATA)
 
 messages:
 	$(XGETTEXT) -C -ki18n -kI18N_NOOP -ktranslate -kaliasLocale *.cc *.cpp *.h && mv messages.po ../po/libplpprops.pot