summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-01-20 18:20:07 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-01-20 18:20:07 +0000
commitad47728c5945e26ce2937636bc27871e16b42416 (patch)
treea497354f1b72a29e1cf98458c68e19ad42d06f00
parent10e79e4288c1bc92e210becb4220710a25bbe888 (diff)
downloadkoffice-ad47728c.tar.gz
koffice-ad47728c.zip
Karbon automake updates
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1077706 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--karbon/plugins/flattenpath/Makefile.am2
-rw-r--r--karbon/plugins/imagetool/Makefile.am2
-rw-r--r--karbon/plugins/insertknots/Makefile.am2
-rw-r--r--karbon/plugins/roundcorners/Makefile.am2
-rw-r--r--karbon/plugins/shadoweffect/Makefile.am2
-rw-r--r--karbon/plugins/whirlpinch/Makefile.am2
-rw-r--r--karbon/plugins/zoomtool/Makefile.am2
-rw-r--r--lib/kofficecore/Makefile.am4
8 files changed, 9 insertions, 9 deletions
diff --git a/karbon/plugins/flattenpath/Makefile.am b/karbon/plugins/flattenpath/Makefile.am
index 2356e933..dc4a52bf 100644
--- a/karbon/plugins/flattenpath/Makefile.am
+++ b/karbon/plugins/flattenpath/Makefile.am
@@ -6,7 +6,7 @@ karbon_flattenpathplugin_la_SOURCES = flattenpathplugin.cc
karbon_flattenpathplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICEUI) \
../../libkarboncommon.la
-karbon_flattenpathplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+karbon_flattenpathplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter$(all_libraries) -module $(KDE_PLUGIN)
partpluginsdir = $(kde_datadir)/karbon/kpartplugins
partplugins_DATA = flattenpathplugin.rc
diff --git a/karbon/plugins/imagetool/Makefile.am b/karbon/plugins/imagetool/Makefile.am
index 491c0f86..24f40b60 100644
--- a/karbon/plugins/imagetool/Makefile.am
+++ b/karbon/plugins/imagetool/Makefile.am
@@ -8,7 +8,7 @@ karbon_imagetoolplugin_la_SOURCES = imagetoolplugin.cc vimagetool.cc
karbon_imagetoolplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICEUI) \
../../libkarboncommon.la
-karbon_imagetoolplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+karbon_imagetoolplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter$(all_libraries) -module $(KDE_PLUGIN)
METASOURCES = AUTO
diff --git a/karbon/plugins/insertknots/Makefile.am b/karbon/plugins/insertknots/Makefile.am
index 9f76a527..5f695fd4 100644
--- a/karbon/plugins/insertknots/Makefile.am
+++ b/karbon/plugins/insertknots/Makefile.am
@@ -6,7 +6,7 @@ karbon_insertknotsplugin_la_SOURCES = insertknotsplugin.cc
karbon_insertknotsplugin_la_LIBADD = $(LIB_KPARTS) \
../../libkarboncommon.la
-karbon_insertknotsplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+karbon_insertknotsplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter$(all_libraries) -module $(KDE_PLUGIN)
partpluginsdir = $(kde_datadir)/karbon/kpartplugins
partplugins_DATA = insertknotsplugin.rc
diff --git a/karbon/plugins/roundcorners/Makefile.am b/karbon/plugins/roundcorners/Makefile.am
index de2ff76c..9be298ec 100644
--- a/karbon/plugins/roundcorners/Makefile.am
+++ b/karbon/plugins/roundcorners/Makefile.am
@@ -6,7 +6,7 @@ karbon_roundcornersplugin_la_SOURCES = roundcornersplugin.cc
karbon_roundcornersplugin_la_LIBADD = $(LIB_KPARTS) \
../../libkarboncommon.la
-karbon_roundcornersplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+karbon_roundcornersplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter$(all_libraries) -module $(KDE_PLUGIN)
partpluginsdir = $(kde_datadir)/karbon/kpartplugins
partplugins_DATA = roundcornersplugin.rc
diff --git a/karbon/plugins/shadoweffect/Makefile.am b/karbon/plugins/shadoweffect/Makefile.am
index 73d9144f..939327ee 100644
--- a/karbon/plugins/shadoweffect/Makefile.am
+++ b/karbon/plugins/shadoweffect/Makefile.am
@@ -6,7 +6,7 @@ karbon_shadoweffectplugin_la_SOURCES = shadoweffectplugin.cc vshadowdecorator.cc
karbon_shadoweffectplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICEUI) \
../../libkarboncommon.la
-karbon_shadoweffectplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+karbon_shadoweffectplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter$(all_libraries) -module $(KDE_PLUGIN)
partpluginsdir = $(kde_datadir)/karbon/kpartplugins
partplugins_DATA = shadoweffectplugin.rc
diff --git a/karbon/plugins/whirlpinch/Makefile.am b/karbon/plugins/whirlpinch/Makefile.am
index a0d53a7c..3aa3bc05 100644
--- a/karbon/plugins/whirlpinch/Makefile.am
+++ b/karbon/plugins/whirlpinch/Makefile.am
@@ -7,7 +7,7 @@ karbon_whirlpinchplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOPAINTER) \
../../libkarboncommon.la
-karbon_whirlpinchplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+karbon_whirlpinchplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter$(all_libraries) -module $(KDE_PLUGIN)
partpluginsdir = $(kde_datadir)/karbon/kpartplugins
partplugins_DATA = whirlpinchplugin.rc
diff --git a/karbon/plugins/zoomtool/Makefile.am b/karbon/plugins/zoomtool/Makefile.am
index a0883c96..89d48733 100644
--- a/karbon/plugins/zoomtool/Makefile.am
+++ b/karbon/plugins/zoomtool/Makefile.am
@@ -8,7 +8,7 @@ karbon_zoomtoolplugin_la_SOURCES = vzoomtool.cc zoomtoolplugin.cc
karbon_zoomtoolplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICEUI) \
../../libkarboncommon.la
-karbon_zoomtoolplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+karbon_zoomtoolplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter$(all_libraries) -module $(KDE_PLUGIN)
METASOURCES = AUTO
diff --git a/lib/kofficecore/Makefile.am b/lib/kofficecore/Makefile.am
index df7cdfa8..56461115 100644
--- a/lib/kofficecore/Makefile.am
+++ b/lib/kofficecore/Makefile.am
@@ -34,7 +34,7 @@ libkofficecore_la_SOURCES = KoDocument.cpp \
KoSpeaker.cpp KoOasisLoadingContext.cpp \
KoRect.cpp
-libkofficecore_la_LDFLAGS = $(all_libraries) -version-info 3:0:0 -no-undefined
+libkofficecore_la_LDFLAGS = $(all_libraries) -version-info 3:0:0 -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio
include_HEADERS = KoContainerHandler.h \
KoFilter.h KoFilterChain.h \
@@ -59,7 +59,7 @@ noinst_HEADERS = KoDocument_p.h KoFilterManager_p.h \
kodocinfopropspage_la_SOURCES = KoDocInfoPropsFactory.cpp
kodocinfopropspage_la_LIBADD = ./libkofficecore.la
-kodocinfopropspage_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kodocinfopropspage_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio
METASOURCES = AUTO