summaryrefslogtreecommitdiffstats
path: root/kword/mailmerge/Makefile.am
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-26 13:10:41 -0600
committerTimothy Pearson <[email protected]>2013-01-26 13:10:41 -0600
commit7422cac1a18dca897d3830a267eb91683d05a95b (patch)
tree2ba309f49b47a5fbb0b226801b224c2532b7ab1a /kword/mailmerge/Makefile.am
parent3fe437def8063926892bddf2dcc733861308836d (diff)
downloadkoffice-7422cac1a18dca897d3830a267eb91683d05a95b.tar.gz
koffice-7422cac1a18dca897d3830a267eb91683d05a95b.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kword/mailmerge/Makefile.am')
-rw-r--r--kword/mailmerge/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/kword/mailmerge/Makefile.am b/kword/mailmerge/Makefile.am
index ccc86c55..4f4e1cb8 100644
--- a/kword/mailmerge/Makefile.am
+++ b/kword/mailmerge/Makefile.am
@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kwmailmerge_classic.la
## Plugin encapsulating the (old) internally stored style
kwmailmerge_classic_la_SOURCES = KWClassicSerialDataSource.cpp
-kwmailmerge_classic_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+kwmailmerge_classic_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts
kwmailmerge_classic_la_LIBADD = $(KOFFICE_LIBS) ../libkwmailmerge_interface.la $(LIB_TDEUI) $(LIB_KOTEXT)
METASOURCES = AUTO