diff options
Diffstat (limited to 'kword')
-rw-r--r-- | kword/Makefile.am | 10 | ||||
-rw-r--r-- | kword/mailmerge/Makefile.am | 2 | ||||
-rw-r--r-- | kword/mailmerge/kspread/Makefile.am | 2 | ||||
-rw-r--r-- | kword/mailmerge/sql/Makefile.am | 4 | ||||
-rw-r--r-- | kword/mailmerge/tdeabc/Makefile.am | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/kword/Makefile.am b/kword/Makefile.am index 64eb84a9..d75ab13a 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 -ltdeio -ltdeparts +libkwordpart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts libkwordpart_la_LIBADD = $(KOFFICE_LIBS) libkwordprivate.la ## A lib with all the code @@ -54,15 +54,15 @@ 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 -ltdeio -ltdeparts $(LIBKSPELL2) +libkwordprivate_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -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 -ltdeio -ltdeparts -libkwmailmerge_interface_la_LIBADD = $(KOFFICE_LIBS) $(LIB_QT) -lDCOP +libkwmailmerge_interface_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts +libkwmailmerge_interface_la_LIBADD = $(KOFFICE_LIBS) $(LIB_TQT) -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 -ltdeio -ltdeparts +kword_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts kword_la_LIBADD = $(KOFFICE_LIBS) xdg_apps_DATA = kword.desktop diff --git a/kword/mailmerge/Makefile.am b/kword/mailmerge/Makefile.am index 773e4308..42df0c52 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 -ltdeio -ltdeparts +kwmailmerge_classic_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts kwmailmerge_classic_la_LIBADD = $(KOFFICE_LIBS) ../libkwmailmerge_interface.la $(LIB_TDEUI) $(LIB_KOTEXT) METASOURCES = AUTO diff --git a/kword/mailmerge/kspread/Makefile.am b/kword/mailmerge/kspread/Makefile.am index 0f96e015..c3a36202 100644 --- a/kword/mailmerge/kspread/Makefile.am +++ b/kword/mailmerge/kspread/Makefile.am @@ -6,7 +6,7 @@ INCLUDES = $(KOFFICE_INCLUDES) $(KOTEXT_INCLUDES) \ kde_module_LTLIBRARIES = kwmailmerge_kspread.la kwmailmerge_kspread_la_SOURCES = kwmailmerge_kspread.cpp kwmailmerge_kspread_config.cpp -kwmailmerge_kspread_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts +kwmailmerge_kspread_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts kwmailmerge_kspread_la_LIBADD = $(KOFFICE_LIBS) ../../libkwmailmerge_interface.la \ $(top_builddir)/kspread/libkspreadcommon.la $(LIB_TDEUI) diff --git a/kword/mailmerge/sql/Makefile.am b/kword/mailmerge/sql/Makefile.am index a8695a92..3f34cb5f 100644 --- a/kword/mailmerge/sql/Makefile.am +++ b/kword/mailmerge/sql/Makefile.am @@ -6,13 +6,13 @@ kde_module_LTLIBRARIES = kwmailmerge_qtsqldb.la kwmailmerge_qtsqldb_power.la ## Plugin encapsulating the QT SQL database interface kwmailmerge_qtsqldb_la_SOURCES = KWQtSqlSerialDataSource.cpp qtsqldatasourceeditor.ui \ KWQtSqlEasyFilter.cpp -kwmailmerge_qtsqldb_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts +kwmailmerge_qtsqldb_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts kwmailmerge_qtsqldb_la_LIBADD = $(KOFFICE_LIBS) libmailmergesqlcommon.la ../../libkwmailmerge_interface.la $(LIB_TDEUI) kwmailmerge_qtsqldb_la_COMPILE_FIRST = qtsqlopenwidget.h ## 2. Plugin encapsulating the QT SQL database interface kwmailmerge_qtsqldb_power_la_SOURCES = KWQtSqlPowerSerialDataSource.cpp kwqtsqlpower.ui KWQtSqlPowerSerialDataSource.skel -kwmailmerge_qtsqldb_power_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts +kwmailmerge_qtsqldb_power_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts kwmailmerge_qtsqldb_power_la_LIBADD = $(KOFFICE_LIBS) libmailmergesqlcommon.la ../../libkwmailmerge_interface.la $(LIB_TDEUI) kwmailmerge_qtsqldb_power_la_COMPILE_FIRST = qtsqlopenwidget.h diff --git a/kword/mailmerge/tdeabc/Makefile.am b/kword/mailmerge/tdeabc/Makefile.am index 0856d2c6..b0c782fd 100644 --- a/kword/mailmerge/tdeabc/Makefile.am +++ b/kword/mailmerge/tdeabc/Makefile.am @@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = kwmailmerge_tdeabc.la ## Plugin encapsulating the QT SQL database interface kwmailmerge_tdeabc_la_SOURCES = KWMailMergeTDEABC.cpp KWMailMergeTDEABCConfig.cpp addresspicker.ui -kwmailmerge_tdeabc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts +kwmailmerge_tdeabc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts kwmailmerge_tdeabc_la_LIBADD = $(KOFFICE_LIBS) ../../libkwmailmerge_interface.la $(LIB_TDEUI) $(LIB_TDEABC) METASOURCES = AUTO |