More automake repairs

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1078727 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

46 files changed, 58 insertions, 54 deletions

diff --git a/filters/karbon/eps/Makefile.am b/filters/karbon/eps/Makefile.am
index 3749dfdc..50dce295 100644
--- a/filters/karbon/eps/Makefile.am
+++ b/filters/karbon/eps/Makefile.am
@@ -6,11 +6,11 @@ libkarbonepsexport_la_SOURCES = \
 	epsexport.cc \
 	epsexportdlg.cc
 
-libkarbonepsexport_la_LDFLAGS = $(KDE_PLUGIN)
+libkarbonepsexport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
 libkarbonepsexport_la_LIBADD  = $(LIB_KOFFICEUI) ../../../karbon/libkarboncommon.la
 
 libkarbonepsimport_la_SOURCES = epsimport.cc pscommentlexer.cc
-libkarbonepsimport_la_LDFLAGS = $(KDE_PLUGIN)
+libkarbonepsimport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
 libkarbonepsimport_la_LIBADD  = $(LIB_KOFFICEUI)
 
 INCLUDES = \
diff --git a/filters/karbon/kontour/Makefile.am b/filters/karbon/kontour/Makefile.am
index 52d6220a..4ba373dc 100644
--- a/filters/karbon/kontour/Makefile.am
+++ b/filters/karbon/kontour/Makefile.am
@@ -10,7 +10,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(KOPAINTER_INCLUDES) -I$(top_srcdir)/
 kde_module_LTLIBRARIES = libkarbonkontourimport.la
 
 libkarbonkontourimport_la_SOURCES = kontourimport.cpp
-libkarbonkontourimport_la_LDFLAGS = -module $(KDE_PLUGIN)
+libkarbonkontourimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
 libkarbonkontourimport_la_LIBADD = $(KOFFICE_LIBS) ../../../karbon/libkarboncommon.la
 
 METASOURCES = AUTO
diff --git a/filters/karbon/png/Makefile.am b/filters/karbon/png/Makefile.am
index 5d8a4efb..a4a0891a 100644
--- a/filters/karbon/png/Makefile.am
+++ b/filters/karbon/png/Makefile.am
@@ -1,6 +1,6 @@
 kde_module_LTLIBRARIES = libkarbonpngexport.la
 
-libkarbonpngexport_la_LDFLAGS = $(KDE_PLUGIN)
+libkarbonpngexport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
 libkarbonpngexport_la_LIBADD = \
 	$(LIB_KOFFICEUI) \
 	../../../karbon/libkarboncommon.la
diff --git a/filters/karbon/svg/Makefile.am b/filters/karbon/svg/Makefile.am
index a1b01f9b..087b6bc4 100644
--- a/filters/karbon/svg/Makefile.am
+++ b/filters/karbon/svg/Makefile.am
@@ -1,11 +1,11 @@
 kde_module_LTLIBRARIES = libkarbonsvgexport.la libkarbonsvgimport.la
 
-libkarbonsvgexport_la_LDFLAGS = $(KDE_PLUGIN)
+libkarbonsvgexport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
 libkarbonsvgexport_la_LIBADD = \
 	$(LIB_KOFFICEUI) \
 	../../../karbon/libkarboncommon.la
 
-libkarbonsvgimport_la_LDFLAGS = $(KDE_PLUGIN)
+libkarbonsvgimport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
 libkarbonsvgimport_la_LIBADD = \
 	$(LIB_KOFFICEUI) \
 	../../../karbon/libkarboncommon.la
diff --git a/filters/karbon/wmf/Makefile.am b/filters/karbon/wmf/Makefile.am
index 38acbe44..6aae72df 100644
--- a/filters/karbon/wmf/Makefile.am
+++ b/filters/karbon/wmf/Makefile.am
@@ -11,11 +11,11 @@ INCLUDES= \
 
 kde_module_LTLIBRARIES = libwmfimport.la libwmfexport.la
 
-libwmfimport_la_LDFLAGS = -module $(KDE_PLUGIN)
+libwmfimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
 libwmfimport_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KOWMF) ../../../karbon/libkarboncommon.la
 libwmfimport_la_SOURCES = wmfimport.cc wmfimportparser.cc
 
-libwmfexport_la_LDFLAGS = -module $(KDE_PLUGIN)
+libwmfexport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
 libwmfexport_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KOWMF) ../../../karbon/libkarboncommon.la
 libwmfexport_la_SOURCES = wmfexport.cc
 
diff --git a/filters/karbon/xcf/Makefile.am b/filters/karbon/xcf/Makefile.am
index 83ef8229..b6e04d8d 100644
--- a/filters/karbon/xcf/Makefile.am
+++ b/filters/karbon/xcf/Makefile.am
@@ -1,6 +1,6 @@
 kde_module_LTLIBRARIES = libkarbonxcfexport.la
 
-libkarbonxcfexport_la_LDFLAGS = $(KDE_PLUGIN)
+libkarbonxcfexport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
 libkarbonxcfexport_la_LIBADD = \
 	$(LIB_KOFFICEUI) \
 	../../../karbon/libkarboncommon.la
diff --git a/filters/kchart/bmp/Makefile.am b/filters/kchart/bmp/Makefile.am
index de6eedf5..05cb996c 100644
--- a/filters/kchart/bmp/Makefile.am
+++ b/filters/kchart/bmp/Makefile.am
@@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
 kde_module_LTLIBRARIES = libkchartbmpexport.la
 
 libkchartbmpexport_la_SOURCES = bmpexport.cpp
-libkchartbmpexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined
+libkchartbmpexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
 libkchartbmpexport_la_LIBADD = ../../../kchart/libkchartcommon.la ../libimageexport/libkchartimageexport.la ../../../filters/libdialogfilter/libdialogfilter.la $(KOFFICE_LIBS)
 noinst_HEADERS = \
 	bmpexport.h
diff --git a/filters/kchart/jpeg/Makefile.am b/filters/kchart/jpeg/Makefile.am
index 88f87b40..9a6ed008 100644
--- a/filters/kchart/jpeg/Makefile.am
+++ b/filters/kchart/jpeg/Makefile.am
@@ -13,7 +13,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
 kde_module_LTLIBRARIES = libkchartjpegexport.la
 
 libkchartjpegexport_la_SOURCES = jpegexport.cpp
-libkchartjpegexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined
+libkchartjpegexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
 libkchartjpegexport_la_LIBADD = ../../../kchart/libkchartcommon.la ../libimageexport/libkchartimageexport.la ../../../filters/libdialogfilter/libdialogfilter.la $(KOFFICE_LIBS)
  
 noinst_HEADERS = \
diff --git a/filters/kchart/mng/Makefile.am b/filters/kchart/mng/Makefile.am
index aaf62f2f..56a37efe 100644
--- a/filters/kchart/mng/Makefile.am
+++ b/filters/kchart/mng/Makefile.am
@@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
 kde_module_LTLIBRARIES = libkchartmngexport.la
 
 libkchartmngexport_la_SOURCES = mngexport.cpp
-libkchartmngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined
+libkchartmngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
 libkchartmngexport_la_LIBADD = ../../../kchart/libkchartcommon.la ../libimageexport/libkchartimageexport.la ../../../filters/libdialogfilter/libdialogfilter.la $(KOFFICE_LIBS)
 noinst_HEADERS = \
 	mngexport.h
diff --git a/filters/kchart/png/Makefile.am b/filters/kchart/png/Makefile.am
index 7231ef13..bf41ecc5 100644
--- a/filters/kchart/png/Makefile.am
+++ b/filters/kchart/png/Makefile.am
@@ -13,7 +13,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
 kde_module_LTLIBRARIES = libkchartpngexport.la
 
 libkchartpngexport_la_SOURCES = pngexport.cpp
-libkchartpngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined
+libkchartpngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
 libkchartpngexport_la_LIBADD = ../../../kchart/libkchartcommon.la ../libimageexport/libkchartimageexport.la ../../../filters/libdialogfilter/libdialogfilter.la $(KOFFICE_LIBS)
 noinst_HEADERS = \
 	pngexport.h 
diff --git a/filters/kchart/svg/Makefile.am b/filters/kchart/svg/Makefile.am
index 4322ff2a..79393b98 100644
--- a/filters/kchart/svg/Makefile.am
+++ b/filters/kchart/svg/Makefile.am
@@ -10,7 +10,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
 kde_module_LTLIBRARIES = libkchartsvgexport.la
 
 libkchartsvgexport_la_SOURCES = svgexport.cc
-libkchartsvgexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined
+libkchartsvgexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
 libkchartsvgexport_la_LIBADD = ../../../kchart/libkchartcommon.la $(KOFFICE_LIBS)
 noinst_HEADERS = \
 	svgexport.h
diff --git a/filters/kchart/xbm/Makefile.am b/filters/kchart/xbm/Makefile.am
index a544e2d5..0aab8eca 100644
--- a/filters/kchart/xbm/Makefile.am
+++ b/filters/kchart/xbm/Makefile.am
@@ -13,7 +13,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
 kde_module_LTLIBRARIES = libkchartxbmexport.la
 
 libkchartxbmexport_la_SOURCES = xbmexport.cpp
-libkchartxbmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined
+libkchartxbmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
 libkchartxbmexport_la_LIBADD = ../../../kchart/libkchartcommon.la ../libimageexport/libkchartimageexport.la ../../../filters/libdialogfilter/libdialogfilter.la $(KOFFICE_LIBS)
 noinst_HEADERS = \
 	xbmexport.h
diff --git a/filters/kchart/xpm/Makefile.am b/filters/kchart/xpm/Makefile.am
index cf92e423..a99dbb50 100644
--- a/filters/kchart/xpm/Makefile.am
+++ b/filters/kchart/xpm/Makefile.am
@@ -13,7 +13,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
 kde_module_LTLIBRARIES = libkchartxpmexport.la
 
 libkchartxpmexport_la_SOURCES = xpmexport.cpp
-libkchartxpmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined
+libkchartxpmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
 libkchartxpmexport_la_LIBADD = ../../../kchart/libkchartcommon.la ../libimageexport/libkchartimageexport.la ../../../filters/libdialogfilter/libdialogfilter.la $(KOFFICE_LIBS)
 noinst_HEADERS = \
 	xpmexport.h
diff --git a/filters/kivio/imageexport/Makefile.am b/filters/kivio/imageexport/Makefile.am
index dce78335..f7264ec4 100644
--- a/filters/kivio/imageexport/Makefile.am
+++ b/filters/kivio/imageexport/Makefile.am
@@ -11,7 +11,7 @@ kde_module_LTLIBRARIES = libkivioimageexport.la
 
 libkivioimageexport_la_SOURCES = kivio_imageexport.cpp \
 	kivio_imageexportwidget.ui kivio_imageexportdialog.cpp
-libkivioimageexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined
+libkivioimageexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
 libkivioimageexport_la_LIBADD = $(top_builddir)/kivio/kiviopart/libkiviocommon.la $(KOFFICE_LIBS)
 
 service_DATA = kivio_image_export.desktop
diff --git a/filters/kpresenter/bmp/Makefile.am b/filters/kpresenter/bmp/Makefile.am
index ece3480f..3276240b 100644
--- a/filters/kpresenter/bmp/Makefile.am
+++ b/filters/kpresenter/bmp/Makefile.am
@@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
 kde_module_LTLIBRARIES = libkpresenterbmpexport.la
 
 libkpresenterbmpexport_la_SOURCES = bmpexport.cpp
-libkpresenterbmpexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined
+libkpresenterbmpexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
 libkpresenterbmpexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la ../../../filters/libdialogfilter/libdialogfilter.la ../libimageexport/libkpresenterimageexport.la $(KOFFICE_LIBS)
 noinst_HEADERS = \
 	bmpexport.h
diff --git a/filters/kpresenter/jpeg/Makefile.am b/filters/kpresenter/jpeg/Makefile.am
index 9f5106c2..35297dc1 100644
--- a/filters/kpresenter/jpeg/Makefile.am
+++ b/filters/kpresenter/jpeg/Makefile.am
@@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
 kde_module_LTLIBRARIES = libkpresenterjpegexport.la
 
 libkpresenterjpegexport_la_SOURCES = jpegexport.cpp
-libkpresenterjpegexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined
+libkpresenterjpegexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
 libkpresenterjpegexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la ../../../filters/libdialogfilter/libdialogfilter.la ../libimageexport/libkpresenterimageexport.la $(KOFFICE_LIBS)
 noinst_HEADERS = \
 	jpegexport.h
diff --git a/filters/kpresenter/mng/Makefile.am b/filters/kpresenter/mng/Makefile.am
index 92cc0f3d..866f6b54 100644
--- a/filters/kpresenter/mng/Makefile.am
+++ b/filters/kpresenter/mng/Makefile.am
@@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
 kde_module_LTLIBRARIES = libkpresentermngexport.la
 
 libkpresentermngexport_la_SOURCES = mngexport.cpp
-libkpresentermngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined
+libkpresentermngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
 libkpresentermngexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la ../../../filters/libdialogfilter/libdialogfilter.la ../libimageexport/libkpresenterimageexport.la $(KOFFICE_LIBS)
 noinst_HEADERS = \
 	mngexport.h
diff --git a/filters/kpresenter/png/Makefile.am b/filters/kpresenter/png/Makefile.am
index 0568bfcf..5da543a2 100644
--- a/filters/kpresenter/png/Makefile.am
+++ b/filters/kpresenter/png/Makefile.am
@@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
 kde_module_LTLIBRARIES = libkpresenterpngexport.la
 
 libkpresenterpngexport_la_SOURCES = pngexport.cpp
-libkpresenterpngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined
+libkpresenterpngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
 libkpresenterpngexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la ../../../filters/libdialogfilter/libdialogfilter.la ../libimageexport/libkpresenterimageexport.la $(KOFFICE_LIBS)
 noinst_HEADERS = \
 	pngexport.h
diff --git a/filters/kpresenter/svg/Makefile.am b/filters/kpresenter/svg/Makefile.am
index 4783e9f8..ccdd67a2 100644
--- a/filters/kpresenter/svg/Makefile.am
+++ b/filters/kpresenter/svg/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
 kde_module_LTLIBRARIES = libkpresentersvgexport.la
 
 libkpresentersvgexport_la_SOURCES = svgexport.cc
-libkpresentersvgexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined
+libkpresentersvgexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
 libkpresentersvgexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la $(KOFFICE_LIBS)
 noinst_HEADERS = \
 	svgexport.h
diff --git a/filters/kpresenter/xbm/Makefile.am b/filters/kpresenter/xbm/Makefile.am
index 1d794f76..cdc7a4fd 100644
--- a/filters/kpresenter/xbm/Makefile.am
+++ b/filters/kpresenter/xbm/Makefile.am
@@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
 kde_module_LTLIBRARIES = libkpresenterxbmexport.la
 
 libkpresenterxbmexport_la_SOURCES = xbmexport.cpp
-libkpresenterxbmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined
+libkpresenterxbmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
 libkpresenterxbmexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la ../../../filters/libdialogfilter/libdialogfilter.la ../libimageexport/libkpresenterimageexport.la $(KOFFICE_LIBS)
 noinst_HEADERS = \
 	xbmexport.h
diff --git a/filters/kpresenter/xpm/Makefile.am b/filters/kpresenter/xpm/Makefile.am
index ffc86c25..9b906659 100644
--- a/filters/kpresenter/xpm/Makefile.am
+++ b/filters/kpresenter/xpm/Makefile.am
@@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
 kde_module_LTLIBRARIES = libkpresenterxpmexport.la
 
 libkpresenterxpmexport_la_SOURCES = xpmexport.cpp
-libkpresenterxpmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined
+libkpresenterxpmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
 libkpresenterxpmexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la ../../../filters/libdialogfilter/libdialogfilter.la ../libimageexport/libkpresenterimageexport.la $(KOFFICE_LIBS)
 noinst_HEADERS = \
 	xpmexport.h
diff --git a/filters/kspread/applixspread/Makefile.am b/filters/kspread/applixspread/Makefile.am
index 944bdd1b..bfe3d15c 100644
--- a/filters/kspread/applixspread/Makefile.am
+++ b/filters/kspread/applixspread/Makefile.am
@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = libapplixspreadimport.la
 
 libapplixspreadimport_la_SOURCES = applixspreadimport.cc
 libapplixspreadimport_la_LIBADD = $(KOFFICE_LIBS)
-libapplixspreadimport_la_LDFLAGS = -module $(KDE_PLUGIN)
+libapplixspreadimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
 noinst_HEADERS = applixspreadimport.h
 
 METASOURCES = AUTO
diff --git a/filters/kspread/dbase/Makefile.am b/filters/kspread/dbase/Makefile.am
index 29322ab4..3131410d 100644
--- a/filters/kspread/dbase/Makefile.am
+++ b/filters/kspread/dbase/Makefile.am
@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = libdbaseimport.la
 
 libdbaseimport_la_SOURCES = dbaseimport.cc dbase.cpp
 libdbaseimport_la_LIBADD = $(KOFFICE_LIBS)
-libdbaseimport_la_LDFLAGS = -module $(KDE_PLUGIN)
+libdbaseimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
 noinst_HEADERS = dbaseimport.h dbase.h
 
 METASOURCES = AUTO
diff --git a/filters/kspread/excel/import/Makefile.am b/filters/kspread/excel/import/Makefile.am
index 8aed7677..4565f675 100644
--- a/filters/kspread/excel/import/Makefile.am
+++ b/filters/kspread/excel/import/Makefile.am
@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = libexcelimport.la
 
 libexcelimport_la_SOURCES = excelimport.cc 
 libexcelimport_la_LIBADD = $(KOFFICE_LIBS) ../sidewinder/libsidewinder.la
-libexcelimport_la_LDFLAGS = -module $(KDE_PLUGIN)
+libexcelimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui -L../../../../lib/store/.libs/ -lkstore
 noinst_HEADERS = excelimport.h
 
 METASOURCES = AUTO
diff --git a/filters/kugar/kugarnop/Makefile.am b/filters/kugar/kugarnop/Makefile.am
index 6db8a0bd..03a025c2 100644
--- a/filters/kugar/kugarnop/Makefile.am
+++ b/filters/kugar/kugarnop/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(all_includes)
 kde_module_LTLIBRARIES = libkugarnopimport.la
 
 libkugarnopimport_la_SOURCES = kugarnopimport.cpp
-libkugarnopimport_la_LDFLAGS = -module $(KDE_PLUGIN)
+libkugarnopimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
 libkugarnopimport_la_LIBADD = $(KOFFICE_LIBS)
 
 noinst_HEADERS = kugarnopimport.h 
diff --git a/filters/kword/hancomword/Makefile.am b/filters/kword/hancomword/Makefile.am
index f5dffb44..d24690d0 100644
--- a/filters/kword/hancomword/Makefile.am
+++ b/filters/kword/hancomword/Makefile.am
@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = libhancomwordimport.la
 
 libhancomwordimport_la_SOURCES = pole.cpp hancomwordimport.cpp
 libhancomwordimport_la_LIBADD = $(KOFFICE_LIBS) 
-libhancomwordimport_la_LDFLAGS = -module $(KDE_PLUGIN)
+libhancomwordimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
 noinst_HEADERS = pole.h hancomwordimport.h
 
 METASOURCES = AUTO
diff --git a/filters/kword/msword/Makefile.am b/filters/kword/msword/Makefile.am
index dc38f0ab..9dedede9 100644
--- a/filters/kword/msword/Makefile.am
+++ b/filters/kword/msword/Makefile.am
@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = libmswordimport.la
 
 libmswordimport_la_SOURCES = mswordimport.cpp document.cpp conversion.cpp \
 	texthandler.cpp tablehandler.cpp graphicshandler.cpp
-libmswordimport_la_LDFLAGS = -module $(KDE_PLUGIN)
+libmswordimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
 libmswordimport_la_LIBADD = $(KOFFICE_LIBS) $(LIBWV2_LIBS)
 
 METASOURCES = AUTO
diff --git a/filters/kword/mswrite/Makefile.am b/filters/kword/mswrite/Makefile.am
index 16cee9e1..39f1ecbe 100644
--- a/filters/kword/mswrite/Makefile.am
+++ b/filters/kword/mswrite/Makefile.am
@@ -9,12 +9,12 @@ kde_module_LTLIBRARIES = libmswriteimport.la libmswriteexport.la
 libmswriteimport_la_SOURCES = mswriteimport.cc \
 								libmswrite_defs.cpp structures_generated.cpp structures_private.cpp structures.cpp libmswrite.cpp ImportDialogUI.ui ImportDialog.cc
 
-libmswriteimport_la_LDFLAGS = -module $(KDE_PLUGIN)
+libmswriteimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
 libmswriteimport_la_LIBADD = $(KOFFICE_LIBS)
 
 libmswriteexport_la_SOURCES = mswriteexport.cc	\
 								libmswrite_defs.cpp structures_generated.cpp structures_private.cpp structures.cpp libmswrite.cpp
-libmswriteexport_la_LDFLAGS = -module $(KDE_PLUGIN)
+libmswriteexport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
 libmswriteexport_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KOWMF) ../libexport/libkwordexportfilters.la
 
 noinst_HEADERS = mswriteimport.h mswriteexport.h \
diff --git a/filters/kword/pdf/Makefile.am b/filters/kword/pdf/Makefile.am
index 15654f77..a8ccc975 100644
--- a/filters/kword/pdf/Makefile.am
+++ b/filters/kword/pdf/Makefile.am
@@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = libpdfimport.la
 libpdfimport_la_SOURCES = misc.cpp transform.cpp data.cpp fstring.cpp \
                           FilterPage.cpp FilterDevice.cpp \
                           pdfdocument.cpp dialog.cpp pdfimport.cpp
-libpdfimport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libpdfimport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
 libpdfimport_la_LIBADD = $(LIB_KOFFICECORE) $(LIBPAPER) ./xpdf/xpdf/libxpdf.la ./xpdf/goo/libgoo.la
 
 METASOURCES = dialog.moc pdfimport.moc
diff --git a/filters/xsltfilter/export/Makefile.am b/filters/xsltfilter/export/Makefile.am
index 9dd925c7..1051a009 100644
--- a/filters/xsltfilter/export/Makefile.am
+++ b/filters/xsltfilter/export/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(all_includes) $(LIBXML_CFLAGS) $(LIB
 kde_module_LTLIBRARIES = libxsltexport.la
 
 libxsltexport_la_SOURCES = xsltexport.cc xsltexportdia.cc xsltproc.cc xsltdialog.ui
-libxsltexport_la_LDFLAGS = $(KDE_RPATH) $(LIBXML_RPATH) $(LIBXSLT_RPATH) $(all_libraries) -module $(KDE_PLUGIN)
+libxsltexport_la_LDFLAGS = $(KDE_RPATH) $(LIBXML_RPATH) $(LIBXSLT_RPATH) $(all_libraries) -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
 libxsltexport_la_LIBADD	= $(KOFFICE_LIBS) $(LIBXSLT_LIBS) $(LIBXML_LIBS)
 
 noinst_HEADERS = xsltexport.h xsltexportdia.h xsltproc.h
diff --git a/filters/xsltfilter/import/Makefile.am b/filters/xsltfilter/import/Makefile.am
index 34b876ac..78f9a840 100644
--- a/filters/xsltfilter/import/Makefile.am
+++ b/filters/xsltfilter/import/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES)  $(all_includes) $(LIBXML_CFLAGS) $(LI
 kde_module_LTLIBRARIES = libxsltimport.la
 
 libxsltimport_la_SOURCES = xsltimport.cc xsltimportdia.cc xsltproc.cc xsltdialog.ui
-libxsltimport_la_LDFLAGS = $(KDE_RPATH) $(LIBXML_RPATH) $(LIBXSLT_RPATH) $(all_libraries) -module $(KDE_PLUGIN)
+libxsltimport_la_LDFLAGS = $(KDE_RPATH) $(LIBXML_RPATH) $(LIBXSLT_RPATH) $(all_libraries) -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
 libxsltimport_la_LIBADD	= $(KOFFICE_LIBS) $(LIBXSLT_LIBS) $(LIBXML_LIBS)
 
 noinst_HEADERS = xsltimport.h xsltimportdia.h xsltproc.h
diff --git a/kexi/formeditor/factories/Makefile.am b/kexi/formeditor/factories/Makefile.am
index e19bf6b3..df585554 100644
--- a/kexi/formeditor/factories/Makefile.am
+++ b/kexi/formeditor/factories/Makefile.am
@@ -4,11 +4,11 @@ INCLUDES = -I$(top_srcdir)/kexi -I$(top_srcdir)/kexi/formeditor \
 	-I$(top_srcdir)/kexi/core \
 	-I$(top_srcdir)/lib -I$(top_srcdir)/lib/koproperty -I$(top_srcdir)/lib/kofficecore $(all_includes)
 kde_module_LTLIBRARIES = kformdesigner_containers.la kformdesigner_stdwidgets.la
-kformdesigner_containers_la_LDFLAGS =  $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module
+kformdesigner_containers_la_LDFLAGS =  $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../lib/koproperty/.libs/ -lkoproperty
 kformdesigner_containers_la_SOURCES =  containerfactory.cpp
 kformdesigner_containers_la_LIBADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la
 
-kformdesigner_stdwidgets_la_LDFLAGS =  $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module
+kformdesigner_stdwidgets_la_LDFLAGS =  $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../lib/koproperty/.libs/ -lkoproperty
 kformdesigner_stdwidgets_la_SOURCES =  stdwidgetfactory.cpp
 kformdesigner_stdwidgets_la_LIBADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la
 
diff --git a/kexi/kexidb/drivers/mySQL/Makefile.am b/kexi/kexidb/drivers/mySQL/Makefile.am
index dca6c26e..e7965bcb 100644
--- a/kexi/kexidb/drivers/mySQL/Makefile.am
+++ b/kexi/kexidb/drivers/mySQL/Makefile.am
@@ -22,7 +22,7 @@ kexidb_mysqldriver_la_LIBADD = $(LIB_KPARTS) \
   -lmysqlclient \
   ../../libkexidb.la
 
-kexidb_mysqldriver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -no-undefined
+kexidb_mysqldriver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui -L../../../../lib/store/.libs/ -lkstore
 
 
 kde_services_DATA = kexidb_mysqldriver.desktop
diff --git a/kexi/kexidb/drivers/pqxx/Makefile.am b/kexi/kexidb/drivers/pqxx/Makefile.am
index 5129c84f..4e964bd8 100644
--- a/kexi/kexidb/drivers/pqxx/Makefile.am
+++ b/kexi/kexidb/drivers/pqxx/Makefile.am
@@ -12,7 +12,8 @@ kexidb_pqxxsqldriver_la_SOURCES = pqxxdriver.cpp pqxxcursor.cpp pqxxconnection.c
 kexidb_pqxxsqldriver_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) -lpqxx ../../libkexidb.la
 
 kexidb_pqxxsqldriver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) \
-	-L$(PQXX_LIBDIR) -L$(PG_LIBDIR) $(VER_INFO) -no-undefined
+	-L$(PQXX_LIBDIR) -L$(PG_LIBDIR) $(VER_INFO) -no-undefined \
+	-lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui -L../../../../lib/store/.libs/ -lkstore
 
 kde_services_DATA = kexidb_pqxxsqldriver.desktop
 
diff --git a/kexi/kexidb/drivers/sqlite/Makefile.am b/kexi/kexidb/drivers/sqlite/Makefile.am
index fc0ad677..28fddb98 100644
--- a/kexi/kexidb/drivers/sqlite/Makefile.am
+++ b/kexi/kexidb/drivers/sqlite/Makefile.am
@@ -16,7 +16,7 @@ kexidb_sqlite3driver_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) \
  $(top_builddir)/kexi/kexidb/libkexidb.la \
  $(top_builddir)/kexi/kexidb/parser/libkexidbparser.la
 
-kexidb_sqlite3driver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) 
+kexidb_sqlite3driver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui -L../../../../lib/store/.libs/ -lkstore -L../../../../kexi/kexiutils/.libs/ -lkexiutils
 
 
 kde_services_DATA = kexidb_sqlite3driver.desktop
diff --git a/kexi/kexidb/drivers/sqlite2/Makefile.am b/kexi/kexidb/drivers/sqlite2/Makefile.am
index 891a071a..55ead118 100644
--- a/kexi/kexidb/drivers/sqlite2/Makefile.am
+++ b/kexi/kexidb/drivers/sqlite2/Makefile.am
@@ -20,7 +20,7 @@ kexidb_sqlite2driver_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) \
  $(top_builddir)/kexi/kexidb/libkexidb.la \
  $(top_builddir)/kexi/kexidb/parser/libkexidbparser.la
 
-kexidb_sqlite2driver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) 
+kexidb_sqlite2driver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui -L../../../../lib/store/.libs/ -lkstore -L../../../../kexi/kexiutils/.libs/ -lkexiutils
 
 
 kde_services_DATA = kexidb_sqlite2driver.desktop
diff --git a/kexi/migration/mysql/Makefile.am b/kexi/migration/mysql/Makefile.am
index 635bbf1d..af7e47ae 100644
--- a/kexi/migration/mysql/Makefile.am
+++ b/kexi/migration/mysql/Makefile.am
@@ -10,7 +10,7 @@ keximigrate_mysql_la_SOURCES = mysqlmigrate.cpp
 
 keximigrate_mysql_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) ../libkeximigrate.la $(MYSQL_LIBS) -lmysqlclient
 
-keximigrate_mysql_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -no-undefined
+keximigrate_mysql_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../kexi/kexidb/.libs/ -lkexidb -L../../../kexi/kexiutils/.libs/ -lkexiutils
 
 kde_services_DATA = keximigrate_mysql.desktop
 
diff --git a/kexi/migration/pqxx/Makefile.am b/kexi/migration/pqxx/Makefile.am
index d49027f1..2e773cc2 100644
--- a/kexi/migration/pqxx/Makefile.am
+++ b/kexi/migration/pqxx/Makefile.am
@@ -12,7 +12,7 @@ keximigrate_pqxx_la_SOURCES = pqxxmigrate.cpp
 #keximigrate_pqxx_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) -lcom_err -lkrb5 -lssl -lcrypto -lcrypt -lpqxx ../libkeximigrate.la
 keximigrate_pqxx_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) -lpqxx ../libkeximigrate.la
 
-keximigrate_pqxx_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -L$(PQXX_LIBDIR) -L$(PG_LIBDIR) $(VER_INFO) -no-undefined
+keximigrate_pqxx_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -L$(PQXX_LIBDIR) -L$(PG_LIBDIR) $(VER_INFO) -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../kexi/kexidb/.libs/ -lkexidb -L../../../kexi/kexiutils/.libs/ -lkexiutils
 
 kde_services_DATA = keximigrate_pqxx.desktop
 
diff --git a/kexi/plugins/forms/Makefile.am b/kexi/plugins/forms/Makefile.am
index e01b4f6c..096a2818 100644
--- a/kexi/plugins/forms/Makefile.am
+++ b/kexi/plugins/forms/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kexihandler_form.la kformdesigner_kexidbwidgets.la
 
 kexihandler_form_la_SOURCES = kexiforms.cpp
 
-kexihandler_form_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined
+kexihandler_form_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../kexi/kexidb/.libs/ -lkexidb -L../../../kexi/kexiutils/.libs/ -lkexiutils -L../../../kexi/widget/.libs/ -lkexiextendedwidgets -L../../../kexi/widget/utils/.libs/ -lkexiguiutils
 kexihandler_form_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \
 	$(top_builddir)/kexi/widget/utils/libkexiguiutils.la \
 	$(top_builddir)/kexi/widget/tableview/libkexidatatable.la \
@@ -13,7 +13,7 @@ kexihandler_form_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \
 	$(top_builddir)/lib/koproperty/libkoproperty.la \
 	./libkexiformutils.la
 
-kformdesigner_kexidbwidgets_la_LDFLAGS =  $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined
+kformdesigner_kexidbwidgets_la_LDFLAGS =  $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../kexi/kexidb/.libs/ -lkexidb -L../../../kexi/kexiutils/.libs/ -lkexiutils -L../../../kexi/widget/.libs/ -lkexiextendedwidgets -L../../../kexi/widget/utils/.libs/ -lkexiguiutils
 kformdesigner_kexidbwidgets_la_SOURCES = kexidbfactory.cpp
 kformdesigner_kexidbwidgets_la_LIBADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la \
 	$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
@@ -24,7 +24,7 @@ libkexiformutils_la_SOURCES = kexiformdataiteminterface.cpp kexidataawarewidgeti
 	kexidataprovider.cpp kexiformscrollview.cpp kexiformeventhandler.cpp \
 	kexidbtextwidgetinterface.cpp kexiactionselectiondialog.cpp kexiformmanager.cpp \
 	kexidatasourcepage.cpp kexiformpart.cpp kexiformview.cpp
-libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -no-undefined
+libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../kexi/kexidb/.libs/ -lkexidb -L../../../kexi/kexiutils/.libs/ -lkexiutils -L../../../kexi/widget/.libs/ -lkexiextendedwidgets -L../../../kexi/widget/utils/.libs/ -lkexiguiutils
 libkexiformutils_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \
 	$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
 	$(top_builddir)/kexi/formeditor/libkformdesigner.la \
@@ -53,4 +53,4 @@ METASOURCES = AUTO
 
 include ../Makefile.common
 noinst_HEADERS = kexidataprovider.h kexidbfactory.h \
-	kexiformpart.h kexiformscrollview.h kexiformview.h
\ No newline at end of file
+	kexiformpart.h kexiformscrollview.h kexiformview.h
diff --git a/kexi/plugins/importexport/csv/Makefile.am b/kexi/plugins/importexport/csv/Makefile.am
index 7ad16495..3d0a15e9 100644
--- a/kexi/plugins/importexport/csv/Makefile.am
+++ b/kexi/plugins/importexport/csv/Makefile.am
@@ -5,7 +5,8 @@ kde_module_LTLIBRARIES = kexihandler_csv_importexport.la
 kexihandler_csv_importexport_la_SOURCES = kexicsv_importexportpart.cpp kexicsvimportdialog.cpp \
 	kexicsvimportoptionsdlg.cpp kexicsvwidgets.cpp kexicsvexport.cpp kexicsvexportwizard.cpp
 
-kexihandler_csv_importexport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module
+kexihandler_csv_importexport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui -L../../../../lib/store/.libs/ -lkstore -L../../../../kexi/kexidb/.libs/ -lkexidb -L../../../../kexi/kexiutils/.libs/ -lkexiutils \
+	-L../../../../kexi/main/.libs/ -lkeximain -L../../../../kexi/widget/.libs/ -lkexiextendedwidgets
 kexihandler_csv_importexport_la_LIBADD = ../../../core/libkexicore.la \
 	../../../migration/libkeximigrate.la
 
diff --git a/kexi/plugins/migration/Makefile.am b/kexi/plugins/migration/Makefile.am
index e496773e..b3046a4f 100644
--- a/kexi/plugins/migration/Makefile.am
+++ b/kexi/plugins/migration/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kexihandler_migration.la
 
 kexihandler_migration_la_SOURCES = keximigrationpart.cpp
 
-kexihandler_migration_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module
+kexihandler_migration_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../kexi/kexidb/.libs/ -lkexidb -L../../../kexi/kexiutils/.libs/ -lkexiutils
 kexihandler_migration_la_LIBADD = ../../core/libkexicore.la \
 	../../migration/libkeximigrate.la
 
diff --git a/kexi/plugins/queries/Makefile.am b/kexi/plugins/queries/Makefile.am
index c0b620d4..8359ebb3 100644
--- a/kexi/plugins/queries/Makefile.am
+++ b/kexi/plugins/queries/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kexihandler_query.la
 kexihandler_query_la_SOURCES = kexiquerypart.cpp kexiquerydesignersql.cpp \
 				kexiquerydesignersqlhistory.cpp kexiquerydesignerguieditor.cpp \
 				kexiqueryview.cpp
-kexihandler_query_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined
+kexihandler_query_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../kexi/kexidb/.libs/ -lkexidb -L../../../kexi/kexiutils/.libs/ -lkexiutils -L../../../kexi/kexidb/parser/.libs/ -lkexidbparser
 kexihandler_query_la_LIBADD = ../../core/libkexicore.la \
   $(top_builddir)/kexi/kexidb/libkexidb.la \
   $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
diff --git a/kexi/plugins/relations/Makefile.am b/kexi/plugins/relations/Makefile.am
index 6e35ab3a..7b191cd6 100644
--- a/kexi/plugins/relations/Makefile.am
+++ b/kexi/plugins/relations/Makefile.am
@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = kexihandler_relation.la
 kexihandler_relation_la_SOURCES = kexirelationpartimpl.cpp \
 				kexirelationmaindlg.cpp
 
-kexihandler_relation_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module
+kexihandler_relation_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../kexi/kexidb/.libs/ -lkexidb -L../../../kexi/kexiutils/.libs/ -lkexiutils
 kexihandler_relation_la_LIBADD = ../../core/libkexicore.la \
 	../../widget/relations/libkexirelationsview.la
 
diff --git a/kexi/plugins/scripting/kexidb/Makefile.am b/kexi/plugins/scripting/kexidb/Makefile.am
index 12f82501..a1a8c51e 100644
--- a/kexi/plugins/scripting/kexidb/Makefile.am
+++ b/kexi/plugins/scripting/kexidb/Makefile.am
@@ -17,7 +17,7 @@ krosskexidb_la_SOURCES = \
     kexidbdrivermanager.cpp \
     kexidbmodule.cpp
 
-krosskexidb_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module
+krosskexidb_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -lkio
 krosskexidb_la_LIBADD = \
     $(LIB_QT) \
     $(LIB_KDECORE) \
diff --git a/kexi/plugins/scripting/kexiscripting/Makefile.am b/kexi/plugins/scripting/kexiscripting/Makefile.am
index ed3e2264..91067cb0 100644
--- a/kexi/plugins/scripting/kexiscripting/Makefile.am
+++ b/kexi/plugins/scripting/kexiscripting/Makefile.am
@@ -6,7 +6,9 @@ kexihandler_script_la_SOURCES = \
     kexiscriptpart.cpp kexiscripteditor.cpp kexiscriptdesignview.cpp
 
 kexihandler_script_la_LDFLAGS = \
-    $(KDE_PLUGIN) -module -no-undefined -Wnounresolved $(all_libraries) $(VER_INFO)
+    $(KDE_PLUGIN) -module -no-undefined -Wnounresolved $(all_libraries) $(VER_INFO) \
+    -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui -L../../../../lib/store/.libs/ -lkstore -L../../../../kexi/kexidb/.libs/ -lkexidb -L../../../../kexi/kexiutils/.libs/ -lkexiutils \
+    -L../../../../lib/kross/api/.libs/ -lkrossapi
 
 kexihandler_script_la_LIBADD = \
     $(top_builddir)/lib/kross/main/libkrossmain.la \
diff --git a/kexi/plugins/tables/Makefile.am b/kexi/plugins/tables/Makefile.am
index 0971a64e..bc763941 100644
--- a/kexi/plugins/tables/Makefile.am
+++ b/kexi/plugins/tables/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kexihandler_table.la
 kexihandler_table_la_SOURCES = kexitablepart.cpp kexitabledesignerview.cpp kexitabledesignerview_p.cpp \
 	kexitabledesigner_dataview.cpp kexitabledesignercommands.cpp kexilookupcolumnpage.cpp
 
-kexihandler_table_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module
+kexihandler_table_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../kexi/kexidb/.libs/ -lkexidb -L../../../kexi/kexiutils/.libs/ -lkexiutils -lkmdi
 kexihandler_table_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \
 	$(top_builddir)/kexi/kexidb/libkexidb.la \
 	$(top_builddir)/kexi/widget/tableview/libkexidatatable.la \