summaryrefslogtreecommitdiffstats
path: root/kword/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/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/Makefile.am')
-rw-r--r--kword/Makefile.am8
1 files changed, 4 insertions, 4 deletions
diff --git a/kword/Makefile.am b/kword/Makefile.am
index 1b89a714..58f3bf4c 100644
--- a/kword/Makefile.am
+++ b/kword/Makefile.am
@@ -9,7 +9,7 @@ lib_LTLIBRARIES = libkwmailmerge_interface.la libkwordprivate.la
## The part
libkwordpart_la_SOURCES = KWFactoryInit.cpp
-libkwordpart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+libkwordpart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts
libkwordpart_la_LIBADD = $(KOFFICE_LIBS) libkwordprivate.la
## A lib with all the code
@@ -54,14 +54,14 @@ libkwordprivate_la_SOURCES = KWTableFrameSet.cpp KWCanvas.cpp KWFrame.cpp KWForm
KWLoadingInfo.cpp
-libkwordprivate_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts $(LIBKSPELL2)
+libkwordprivate_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts $(LIBKSPELL2)
libkwordprivate_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KOTEXT) ../lib/kformula/libkformulalib.la ./libkwmailmerge_interface.la
METASOURCES = AUTO
## The mailmerge interface library
libkwmailmerge_interface_la_SOURCES = KWMailMergeDataSource.cpp KWMailMergeDataSource.skel
-libkwmailmerge_interface_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+libkwmailmerge_interface_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts
libkwmailmerge_interface_la_LIBADD = $(KOFFICE_LIBS) $(LIB_QT) -lDCOP
twincludedir = $(includedir)/kword
twinclude_HEADERS = KWMailMergeDataSource.h
@@ -73,7 +73,7 @@ kwmailmerge_servicetypedir=$(kde_servicetypesdir)
tdeinit_LTLIBRARIES = kword.la
bin_PROGRAMS =
kword_la_SOURCES = main.cpp
-kword_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+kword_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts
kword_la_LIBADD = $(KOFFICE_LIBS)
xdg_apps_DATA = kword.desktop