Automake repairs

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

karbon/Makefile.am

@@ -16,7 +16,7 @@ kde_module_LTLIBRARIES = libkarbonpart.la
 
 libkarboncommon_la_SOURCES = karbon_factory.cc 	karbon_resourceserver.cc 	karbon_part.cc 	karbon_part_iface.cc 	karbon_part_iface.skel 	karbon_view.cc 	karbon_view_iface.cc 	karbon_view_iface.skel karbon_drag.cpp karbon_grid_data.cpp karbon_tool_registry.cc karbon_tool_factory.cc	vtoolcontroller.cc vtool.cc
 
-libkarboncommon_la_LDFLAGS = $(KDE_RPATH) $(LIBFREETYPE_RPATH) $(LIBMAGICK_LDFLAGS) -no-undefined
+libkarboncommon_la_LDFLAGS = $(KDE_RPATH) $(LIBFREETYPE_RPATH) $(LIBMAGICK_LDFLAGS) -no-undefined $(LIB_QT)
 libkarboncommon_la_LIBADD = $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) $(LIB_KOPALETTE) $(LIB_KOPAINTER) $(LIB_KOTEXT) \
 	dockers/libkarbondockers.la \
 	widgets/libkarbonwidgets.la \
@@ -33,13 +33,13 @@ libkarboncommon_la_LIBADD = $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) $(LIB_KOPALETTE)
 	$(LIBFREETYPE_LIBS)
 
 libkarbonpart_la_SOURCES = karbon_factory_init.cc
-libkarbonpart_la_LDFLAGS = $(KDE_PLUGIN) $(LIBFREETYPE_RPATH)
+libkarbonpart_la_LDFLAGS = $(KDE_PLUGIN) $(LIBFREETYPE_RPATH) $(LIB_QT)
 libkarbonpart_la_LIBADD = libkarboncommon.la
 
 bin_PROGRAMS =
 kdeinit_LTLIBRARIES = karbon.la
 karbon_la_SOURCES = main.cc
-karbon_la_LDFLAGS = $(all_libraries) -module -avoid-version
+karbon_la_LDFLAGS = $(all_libraries) -module -avoid-version $(LIB_QT)
 karbon_la_LIBADD = libkarboncommon.la
 
 noinst_HEADERS = \

karbon/tools/Makefile.am

@@ -57,7 +57,7 @@ karbon_defaulttools_la_SOURCES = \
 	vdefaulttools.cc
 
 karbon_defaulttools_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICEUI) ../libkarboncommon.la
-karbon_defaulttools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+karbon_defaulttools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../lib/kofficeui/.libs/ -lkofficeui -L../../lib/kofficecore/.libs/ -lkofficecore -L../../lib/kopainter/.libs/ -lkopainter
 
 karbon_defaulttools_la_METASOURCES = \
 	AUTO