diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/kformula/Makefile.am | 2 | ||||
-rw-r--r-- | lib/kofficecore/Makefile.am | 2 | ||||
-rw-r--r-- | lib/koproperty/Makefile.am | 2 | ||||
-rw-r--r-- | lib/koproperty/editors/Makefile.am | 2 | ||||
-rw-r--r-- | lib/koproperty/test/Makefile.am | 2 | ||||
-rw-r--r-- | lib/kotext/kohyphen/Makefile.am | 6 | ||||
-rw-r--r-- | lib/kotext/tests/Makefile.am | 2 | ||||
-rw-r--r-- | lib/kross/api/Makefile.am | 2 | ||||
-rw-r--r-- | lib/kross/main/Makefile.am | 4 | ||||
-rw-r--r-- | lib/kross/python/Makefile.am | 2 | ||||
-rw-r--r-- | lib/kross/ruby/Makefile.am | 2 | ||||
-rw-r--r-- | lib/kross/runner/Makefile.am | 4 | ||||
-rw-r--r-- | lib/kross/test/Makefile.am | 6 | ||||
-rw-r--r-- | lib/kwmf/Makefile.am | 4 |
14 files changed, 21 insertions, 21 deletions
diff --git a/lib/kformula/Makefile.am b/lib/kformula/Makefile.am index eb795cc3..4ad27bcc 100644 --- a/lib/kformula/Makefile.am +++ b/lib/kformula/Makefile.am @@ -26,7 +26,7 @@ libkformulalib_la_SOURCES = basicelement.cc contextstyle.cc formulacursor.cc \ # kformuladefs.h kformulaconfigpage.h libkformulalib_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined $(KDE_RPATH) -libkformulalib_la_LIBADD = $(LIB_KDEUI) $(LIB_KOTEXT) +libkformulalib_la_LIBADD = $(LIB_TDEUI) $(LIB_KOTEXT) libkformulalib_la_METASOURCES = AUTO diff --git a/lib/kofficecore/Makefile.am b/lib/kofficecore/Makefile.am index 2312578d..681995b7 100644 --- a/lib/kofficecore/Makefile.am +++ b/lib/kofficecore/Makefile.am @@ -4,7 +4,7 @@ SUBDIRS = . tests KDE_CXXFLAGS = $(USE_RTTI) $(WOVERLOADED_VIRTUAL) INCLUDES= $(KSTORE_INCLUDES) $(KWMF_INCLUDES) $(all_includes) libkofficecore_la_LIBADD = $(LIB_KSTORE) $(LIB_KOWMF) $(LIB_KPARTS) \ - $(LIB_KDEPRINT) $(LIB_KABC) $(LIB_KWMF) + $(LIB_TDEPRINT) $(LIB_KABC) $(LIB_KWMF) ####### Files diff --git a/lib/koproperty/Makefile.am b/lib/koproperty/Makefile.am index 654debd3..90ead373 100644 --- a/lib/koproperty/Makefile.am +++ b/lib/koproperty/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = -I$(srcdir)/editors -I$(top_srcdir)/lib/kofficecore $(all_includes) lib_LTLIBRARIES = libkoproperty.la -libkoproperty_la_LIBADD = $(LIB_KDEUI) ./editors/libkopropertyeditors.la +libkoproperty_la_LIBADD = $(LIB_TDEUI) ./editors/libkopropertyeditors.la libkoproperty_la_LDFLAGS = -no-undefined $(all_libraries) -version-info 2:0:0 libkoproperty_la_SOURCES = property.cpp customproperty.cpp set.cpp editor.cpp \ editoritem.cpp factory.cpp widget.cpp diff --git a/lib/koproperty/editors/Makefile.am b/lib/koproperty/editors/Makefile.am index 461fbc00..f617a19f 100644 --- a/lib/koproperty/editors/Makefile.am +++ b/lib/koproperty/editors/Makefile.am @@ -1,7 +1,7 @@ INCLUDES = -I$(top_srcdir)/lib/koproperty -I$(top_srcdir)/lib/kofficecore $(all_includes) noinst_LTLIBRARIES = libkopropertyeditors.la -libkopropertyeditors_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) +libkopropertyeditors_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) libkopropertyeditors_la_LDFLAGS = -Wno-unresolved $(all_libraries) libkopropertyeditors_la_SOURCES = booledit.cpp coloredit.cpp combobox.cpp cursoredit.cpp dateedit.cpp \ datetimeedit.cpp dummywidget.cpp fontedit.cpp linestyledit.cpp pixmapedit.cpp pointedit.cpp \ diff --git a/lib/koproperty/test/Makefile.am b/lib/koproperty/test/Makefile.am index edd3885b..22bacaa6 100644 --- a/lib/koproperty/test/Makefile.am +++ b/lib/koproperty/test/Makefile.am @@ -6,7 +6,7 @@ METASOURCES = AUTO noinst_PROGRAMS = propertytest propertytest_SOURCES = main.cpp test.cpp -propertytest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +propertytest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor propertytest_LDADD = $(LIB_KOPROPERTY) # this is where the shell's XML-GUI resource file goes diff --git a/lib/kotext/kohyphen/Makefile.am b/lib/kotext/kohyphen/Makefile.am index 915423c2..724b0257 100644 --- a/lib/kotext/kohyphen/Makefile.am +++ b/lib/kotext/kohyphen/Makefile.am @@ -7,7 +7,7 @@ noinst_HEADERS = hnjalloc.h hyphen.h kohyphen.h noinst_LTLIBRARIES = libkohyphen.la libkohyphen_la_SOURCES = hnjalloc.c hyphen.c kohyphen.cpp -libkohyphen_la_LIBADD = $(LIB_KDECORE) +libkohyphen_la_LIBADD = $(LIB_TDECORE) libkohyphen_la_LDFLAGS = $(all_libraries) -no-undefined dictsdir = $(kde_datadir)/koffice/hyphdicts @@ -17,5 +17,5 @@ SUBDIRS = . hyphdicts check_PROGRAMS = kohyphentest kohyphentest_SOURCES = kohyphentest.cpp -kohyphentest_LDADD = ./libkohyphen.la $(LIB_QT) $(LIB_KDECORE) -kohyphentest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kohyphentest_LDADD = ./libkohyphen.la $(LIB_QT) $(LIB_TDECORE) +kohyphentest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor diff --git a/lib/kotext/tests/Makefile.am b/lib/kotext/tests/Makefile.am index 14c6f7a0..d5cf50a2 100644 --- a/lib/kotext/tests/Makefile.am +++ b/lib/kotext/tests/Makefile.am @@ -8,7 +8,7 @@ check_PROGRAMS = kotextformattertest kobordertest kovariabletest TESTS = kotextformattertest kovariabletest LDADD = ../libkotext.la -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kobordertest_SOURCES = kobordertest.cpp kotextformattertest_SOURCES = kotextformattertest.cpp diff --git a/lib/kross/api/Makefile.am b/lib/kross/api/Makefile.am index 166e1bfa..7cc93ba8 100644 --- a/lib/kross/api/Makefile.am +++ b/lib/kross/api/Makefile.am @@ -40,7 +40,7 @@ libkrossapi_la_SOURCES = \ interpreter.cpp libkrossapi_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved -libkrossapi_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) +libkrossapi_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) METASOURCES = AUTO SUBDIRS = . diff --git a/lib/kross/main/Makefile.am b/lib/kross/main/Makefile.am index 0ab90117..4072718a 100644 --- a/lib/kross/main/Makefile.am +++ b/lib/kross/main/Makefile.am @@ -21,9 +21,9 @@ maininclude_HEADERS = \ libkrossmain_la_LIBADD = \ $(LIB_QT) \ - $(LIB_KDECORE) \ + $(LIB_TDECORE) \ $(LIB_KFILE) \ - $(LIB_KDEUI) \ + $(LIB_TDEUI) \ $(LIB_KNEWSTUFF) \ $(LIB_KROSS_API) diff --git a/lib/kross/python/Makefile.am b/lib/kross/python/Makefile.am index 5eff2abe..743b3e0c 100644 --- a/lib/kross/python/Makefile.am +++ b/lib/kross/python/Makefile.am @@ -23,7 +23,7 @@ krosspython_la_SOURCES = \ krosspython_la_LIBADD = \ $(LIB_QT) \ - $(LIB_KDECORE) \ + $(LIB_TDECORE) \ cxx/libkrosspythoncxx.la \ ../api/libkrossapi.la \ ../main/libkrossmain.la diff --git a/lib/kross/ruby/Makefile.am b/lib/kross/ruby/Makefile.am index fb8ddfac..1a06e7a4 100644 --- a/lib/kross/ruby/Makefile.am +++ b/lib/kross/ruby/Makefile.am @@ -8,7 +8,7 @@ krossruby_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(RUBY_LIBRUBYARG) -module krossruby_la_LIBADD = \ $(LIB_QT) \ - $(LIB_KDECORE) \ + $(LIB_TDECORE) \ ../api/libkrossapi.la \ ../main/libkrossmain.la diff --git a/lib/kross/runner/Makefile.am b/lib/kross/runner/Makefile.am index 4de9bed7..1b2c9357 100644 --- a/lib/kross/runner/Makefile.am +++ b/lib/kross/runner/Makefile.am @@ -4,8 +4,8 @@ include $(top_srcdir)/lib/kross/Makefile.global bin_PROGRAMS = krossrunner krossrunner_SOURCES = main.cpp -krossrunner_LDADD = $(LIB_QT) $(LIB_KDECORE) ../api/libkrossapi.la ../main/libkrossmain.la +krossrunner_LDADD = $(LIB_QT) $(LIB_TDECORE) ../api/libkrossapi.la ../main/libkrossmain.la INCLUDES = $(KROSS_INCLUDES) $(all_includes) -krossrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +krossrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor SUBDIRS = . METASOURCES = AUTO diff --git a/lib/kross/test/Makefile.am b/lib/kross/test/Makefile.am index 04fa1c71..09e51e74 100644 --- a/lib/kross/test/Makefile.am +++ b/lib/kross/test/Makefile.am @@ -6,12 +6,12 @@ krosstest_SOURCES = testobject.cpp testaction.cpp testplugin.cpp testwindow.cpp krosstest_LDADD = \ $(LIB_QT) \ - $(LIB_KDECORE) \ - $(LIB_KDEUI) \ + $(LIB_TDECORE) \ + $(LIB_TDEUI) \ ../api/libkrossapi.la \ ../main/libkrossmain.la INCLUDES = $(KROSS_INCLUDES) $(all_includes) -krosstest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +krosstest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor SUBDIRS = . METASOURCES = AUTO diff --git a/lib/kwmf/Makefile.am b/lib/kwmf/Makefile.am index a7af75d4..4387792f 100644 --- a/lib/kwmf/Makefile.am +++ b/lib/kwmf/Makefile.am @@ -3,7 +3,7 @@ INCLUDES= $(KOFFICECORE_INCLUDES) -I$(srcdir) $(all_includes) libkwmf_la_LDFLAGS = $(all_libraries) -version-info 3:0:0 -no-undefined # We use tdecore for kdDebug :) -libkwmf_la_LIBADD = $(LIB_KDECORE) +libkwmf_la_LIBADD = $(LIB_TDECORE) ####### Files @@ -16,4 +16,4 @@ noinst_HEADERS = kwmf.h qwmf.h metafuncs.h wmfstruct.h kowmfreadprivate.h kowmfs libkowmf_la_SOURCES = kowmfreadprivate.cc kowmfstack.cc kowmfread.cc kowmfwrite.cc kowmfpaint.cc libkowmf_la_LDFLAGS = $(all_libraries) -version-info 2:0:0 -no-undefined -libkowmf_la_LIBADD = $(LIB_KDECORE) +libkowmf_la_LIBADD = $(LIB_TDECORE) |