From 57cce360ee1580350fe7a9585103948adce55de7 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 6 Nov 2011 21:48:11 -0600 Subject: [PATCH] Rename additional instances of KDE to TDE --- buildtools/lib/base/Makefile.am | 2 +- buildtools/lib/parsers/autotools/tests/Makefile.am | 4 ++-- buildtools/lib/parsers/qmake/tests/Makefile.am | 4 ++-- buildtools/lib/widgets/Makefile.am | 2 +- doc/kdevelop/project-management.docbook | 2 +- kdevdesigner/src/Makefile.am | 2 +- languages/cpp/app_templates/kapp/src-Makefile.am | 4 ++-- languages/cpp/app_templates/kcmodule/src-Makefile.am | 2 +- languages/cpp/app_templates/kconfig35/src-Makefile.am | 2 +- languages/cpp/app_templates/kde4app/kde4app-CMakeLists.txt | 2 +- languages/cpp/app_templates/kdedcop/src-Makefile.am | 2 +- languages/cpp/app_templates/khello/src-Makefile.am | 2 +- languages/cpp/app_templates/khello2/src-Makefile.am | 2 +- languages/cpp/app_templates/kicker/src-Makefile.am | 2 +- languages/cpp/app_templates/kscreensaver/src-Makefile.am | 4 ++-- languages/cpp/app_templates/kxt/src-Makefile.am | 2 +- languages/lib/debugger/Makefile.am | 2 +- languages/lib/designer_integration/Makefile.am | 2 +- languages/ruby/app_templates/kapp/src-Makefile.am | 2 +- languages/ruby/app_templates/kxt/src-Makefile.am | 2 +- lib/catalog/Makefile.am | 2 +- lib/cppparser/Makefile.am | 2 +- lib/interfaces/Makefile.am | 2 +- lib/interfaces/external/Makefile.am | 2 +- parts/documentation/interfaces/Makefile.am | 2 +- parts/documentation/tools/htdig/Makefile.am | 2 +- src/Makefile.am | 4 ++-- src/kconf_update/Makefile.am | 2 +- src/newui/Makefile.am | 2 +- src/profileengine/editor/Makefile.am | 2 +- src/profileengine/lib/Makefile.am | 2 +- 31 files changed, 36 insertions(+), 36 deletions(-) diff --git a/buildtools/lib/base/Makefile.am b/buildtools/lib/base/Makefile.am index 00645ec0..27fc66c5 100644 --- a/buildtools/lib/base/Makefile.am +++ b/buildtools/lib/base/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ METASOURCES = AUTO lib_LTLIBRARIES = libkdevbuildbase.la libkdevbuildbase_la_LDFLAGS = $(all_libraries) -libkdevbuildbase_la_LIBADD = $(top_builddir)/lib/interfaces/libkdevinterfaces.la $(LIB_QT) $(LIB_KDEUI) +libkdevbuildbase_la_LIBADD = $(top_builddir)/lib/interfaces/libkdevinterfaces.la $(LIB_QT) $(LIB_TDEUI) libkdevbuildbase_la_SOURCES = kdevbuildtool.cpp kdevelopbuildtoolsincludedir = $(includedir)/kdevelop/buildtools/base kdevelopbuildtoolsinclude_HEADERS = kdevbuildtool.h diff --git a/buildtools/lib/parsers/autotools/tests/Makefile.am b/buildtools/lib/parsers/autotools/tests/Makefile.am index 222a0482..30c67288 100644 --- a/buildtools/lib/parsers/autotools/tests/Makefile.am +++ b/buildtools/lib/parsers/autotools/tests/Makefile.am @@ -12,10 +12,10 @@ METASOURCES = AUTO check_PROGRAMS = runner viewer -runner_LDFLAGS = $(all_libraries) $(LIB_KDECORE) $(KDE_RPATH) +runner_LDFLAGS = $(all_libraries) $(LIB_TDECORE) $(KDE_RPATH) runner_LDADD = $(top_builddir)/buildtools/lib/parsers/autotools/libkdevautotoolsparser.la runner_SOURCES = runner.cpp -viewer_LDFLAGS = $(all_libraries) $(LIB_KDECORE) $(KDE_RPATH) +viewer_LDFLAGS = $(all_libraries) $(LIB_TDECORE) $(KDE_RPATH) viewer_LDADD = $(top_builddir)/buildtools/lib/parsers/autotools/libkdevautotoolsparser.la viewer_SOURCES = viewer.cpp viewer_main.cpp viewerbase.ui diff --git a/buildtools/lib/parsers/qmake/tests/Makefile.am b/buildtools/lib/parsers/qmake/tests/Makefile.am index a73f8f4e..e1932f7e 100644 --- a/buildtools/lib/parsers/qmake/tests/Makefile.am +++ b/buildtools/lib/parsers/qmake/tests/Makefile.am @@ -12,10 +12,10 @@ METASOURCES = AUTO noinst_PROGRAMS = runner viewer -runner_LDFLAGS = $(all_libraries) $(LIB_KDECORE) $(KDE_RPATH) +runner_LDFLAGS = $(all_libraries) $(LIB_TDECORE) $(KDE_RPATH) runner_LDADD = $(top_builddir)/buildtools/lib/parsers/qmake/libkdevqmakeparser.la runner_SOURCES = runner.cpp -viewer_LDFLAGS = --no-undefined $(all_libraries) $(LIB_KDECORE) $(KDE_RPATH) +viewer_LDFLAGS = --no-undefined $(all_libraries) $(LIB_TDECORE) $(KDE_RPATH) viewer_LDADD = $(top_builddir)/buildtools/lib/parsers/qmake/libkdevqmakeparser.la viewer_SOURCES = viewer.cpp viewer_main.cpp viewerbase.ui diff --git a/buildtools/lib/widgets/Makefile.am b/buildtools/lib/widgets/Makefile.am index ad607b18..aef5a5c2 100644 --- a/buildtools/lib/widgets/Makefile.am +++ b/buildtools/lib/widgets/Makefile.am @@ -8,7 +8,7 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util \ lib_LTLIBRARIES = libkdevbuildtoolswidgets.la libkdevbuildtoolswidgets_la_LDFLAGS = $(all_libraries) libkdevbuildtoolswidgets_la_LIBADD = $(top_builddir)/lib/interfaces/libkdevinterfaces.la \ - $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) -lktexteditor + $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -lktexteditor libkdevbuildtoolswidgets_la_SOURCES = addenvvardlg.cpp addfilesdialog.cpp \ environmentdisplaydialog.cpp environmentdisplaydialogbase.ui environmentvariableswidget.cpp \ environmentvariableswidgetbase.ui envvartools.cpp makeoptionswidget.cpp makeoptionswidgetbase.ui \ diff --git a/doc/kdevelop/project-management.docbook b/doc/kdevelop/project-management.docbook index eb0aebce..75674203 100644 --- a/doc/kdevelop/project-management.docbook +++ b/doc/kdevelop/project-management.docbook @@ -261,7 +261,7 @@ INCLUDES = $(all_includes) myapp_LDFLAGS = $(KDE_RPATH) $(all_libraries) # the libraries to link against. -myapp_LDADD = $(LIB_KFILE) $(LIB_KDEPRINT) +myapp_LDADD = $(LIB_KFILE) $(LIB_TDEPRINT) # which sources should be compiled for myapp myapp_SOURCES = main.cpp myapp.cpp myappview.cpp diff --git a/kdevdesigner/src/Makefile.am b/kdevdesigner/src/Makefile.am index d8bd33c8..a241ff66 100644 --- a/kdevdesigner/src/Makefile.am +++ b/kdevdesigner/src/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = kdevdesigner # the application source, library search path, and link libraries kdevdesigner_SOURCES = main.cpp kdevdesigner.cpp -kdevdesigner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kdevdesigner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kdevdesigner_LDADD = $(LIB_KPARTS) # this is where the desktop file will go diff --git a/languages/cpp/app_templates/kapp/src-Makefile.am b/languages/cpp/app_templates/kapp/src-Makefile.am index 318e274a..8c3e28bd 100644 --- a/languages/cpp/app_templates/kapp/src-Makefile.am +++ b/languages/cpp/app_templates/kapp/src-Makefile.am @@ -11,7 +11,7 @@ INCLUDES = $(all_includes) %{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) # the libraries to link against. -%{APPNAMELC}_LDADD = $(LIB_KFILE) $(LIB_KDEPRINT) +%{APPNAMELC}_LDADD = $(LIB_KFILE) $(LIB_TDEPRINT) # which sources should be compiled for %{APPNAMELC} %{APPNAMELC}_SOURCES = main.cpp %{APPNAMELC}.cpp %{APPNAMELC}view.cpp \ @@ -22,7 +22,7 @@ noinst_HEADERS = %{APPNAMELC}.h %{APPNAMELC}view.h pref.h # client stuff %{APPNAMELC}_client_LDFLAGS = $(KDE_RPATH) $(all_libraries) -%{APPNAMELC}_client_LDADD = $(LIB_KDECORE) +%{APPNAMELC}_client_LDADD = $(LIB_TDECORE) %{APPNAMELC}_client_SOURCES = %{APPNAMELC}_client.cpp # let autotqmoc handle all of the meta source files (tqmoc) diff --git a/languages/cpp/app_templates/kcmodule/src-Makefile.am b/languages/cpp/app_templates/kcmodule/src-Makefile.am index e5d30776..9d745b42 100644 --- a/languages/cpp/app_templates/kcmodule/src-Makefile.am +++ b/languages/cpp/app_templates/kcmodule/src-Makefile.am @@ -5,7 +5,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = kcm_%{APPNAMELC}.la kcm_%{APPNAMELC}_la_SOURCES = %{APPNAMELC}.cpp -kcm_%{APPNAMELC}_la_LIBADD = $(LIB_KDEUI) +kcm_%{APPNAMELC}_la_LIBADD = $(LIB_TDEUI) kcm_%{APPNAMELC}_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined diff --git a/languages/cpp/app_templates/kconfig35/src-Makefile.am b/languages/cpp/app_templates/kconfig35/src-Makefile.am index 737b7399..529fe0ef 100644 --- a/languages/cpp/app_templates/kconfig35/src-Makefile.am +++ b/languages/cpp/app_templates/kconfig35/src-Makefile.am @@ -14,7 +14,7 @@ METASOURCES = AUTO %{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) # the libraries to link against. -%{APPNAMELC}_LDADD = $(LIB_KFILE) $(LIB_KDEPRINT) +%{APPNAMELC}_LDADD = $(LIB_KFILE) $(LIB_TDEPRINT) # which sources should be compiled for %{APPNAMELC} %{APPNAMELC}_SOURCES = settings.kcfgc main.cpp %{APPNAMELC}.cpp %{APPNAMELC}view.cpp \ diff --git a/languages/cpp/app_templates/kde4app/kde4app-CMakeLists.txt b/languages/cpp/app_templates/kde4app/kde4app-CMakeLists.txt index c29d33da..f4552a3c 100644 --- a/languages/cpp/app_templates/kde4app/kde4app-CMakeLists.txt +++ b/languages/cpp/app_templates/kde4app/kde4app-CMakeLists.txt @@ -17,7 +17,7 @@ kde4_add_kcfg_files(%{APPNAMELC}_SRCS settings.kcfgc ) kde4_add_executable(%{APPNAMELC} ${%{APPNAMELC}_SRCS}) -target_link_libraries(%{APPNAMELC} ${KDE4_KDEUI_LIBS} ) +target_link_libraries(%{APPNAMELC} ${KDE4_TDEUI_LIBS} ) install(TARGETS %{APPNAMELC} DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/languages/cpp/app_templates/kdedcop/src-Makefile.am b/languages/cpp/app_templates/kdedcop/src-Makefile.am index 69cbe936..f3aab0da 100644 --- a/languages/cpp/app_templates/kdedcop/src-Makefile.am +++ b/languages/cpp/app_templates/kdedcop/src-Makefile.am @@ -20,4 +20,4 @@ bin_PROGRAMS = %{APPNAMELC} # the application source, library search path, and link libraries %{APPNAMELC}_SOURCES = main.cpp %{APPNAMELC}.cpp %{APPNAMELC}_iface.skel mainclass.cpp %{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) -%{APPNAMELC}_LDADD = $(LIB_KDEUI) +%{APPNAMELC}_LDADD = $(LIB_TDEUI) diff --git a/languages/cpp/app_templates/khello/src-Makefile.am b/languages/cpp/app_templates/khello/src-Makefile.am index 9537dc00..95da64db 100644 --- a/languages/cpp/app_templates/khello/src-Makefile.am +++ b/languages/cpp/app_templates/khello/src-Makefile.am @@ -23,7 +23,7 @@ bin_PROGRAMS = %{APPNAMELC} # the application source, library search path, and link libraries %{APPNAMELC}_SOURCES = main.cpp %{APPNAMELC}.cpp %{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) -%{APPNAMELC}_LDADD = $(LIB_KDEUI) +%{APPNAMELC}_LDADD = $(LIB_TDEUI) # this is where the desktop file will go shelldesktopdir = $(kde_appsdir)/Utilities diff --git a/languages/cpp/app_templates/khello2/src-Makefile.am b/languages/cpp/app_templates/khello2/src-Makefile.am index 748c54e3..d09cb623 100644 --- a/languages/cpp/app_templates/khello2/src-Makefile.am +++ b/languages/cpp/app_templates/khello2/src-Makefile.am @@ -23,7 +23,7 @@ bin_PROGRAMS = %{APPNAMELC} # the application source, library search path, and link libraries %{APPNAMELC}_SOURCES = main.cpp %{APPNAMELC}.cpp %{APPNAMELC}widget.cpp %{APPNAMELC}widgetbase.ui %{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) -%{APPNAMELC}_LDADD = $(LIB_KDEUI) +%{APPNAMELC}_LDADD = $(LIB_TDEUI) # this is where the desktop file will go shelldesktopdir = $(kde_appsdir)/Utilities diff --git a/languages/cpp/app_templates/kicker/src-Makefile.am b/languages/cpp/app_templates/kicker/src-Makefile.am index 424062d1..5c2f0136 100644 --- a/languages/cpp/app_templates/kicker/src-Makefile.am +++ b/languages/cpp/app_templates/kicker/src-Makefile.am @@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = %{APPNAMELC}_panelapplet.la %{APPNAMELC}_panelapplet_la_SOURCES = %{APPNAMELC}.cpp %{APPNAMELC}_panelapplet_la_LDFLAGS = -module -avoid-version $(all_libraries) -%{APPNAMELC}_panelapplet_la_LIBADD = $(LIB_KDEUI) +%{APPNAMELC}_panelapplet_la_LIBADD = $(LIB_TDEUI) %{APPNAMELC}_DATA = %{APPNAMELC}.desktop %{APPNAMELC}dir = $(kde_datadir)/kicker/applets diff --git a/languages/cpp/app_templates/kscreensaver/src-Makefile.am b/languages/cpp/app_templates/kscreensaver/src-Makefile.am index e19ffb77..175ff155 100644 --- a/languages/cpp/app_templates/kscreensaver/src-Makefile.am +++ b/languages/cpp/app_templates/kscreensaver/src-Makefile.am @@ -6,11 +6,11 @@ METASOURCES = AUTO INCLUDES = $(all_includes) LDFLAGS = $(all_libraries) $(KDE_RPATH) -LDADD = $(LIB_KDEUI) -lkscreensaver -lm +LDADD = $(LIB_TDEUI) -lkscreensaver -lm bin_PROGRAMS = %{APPNAMELC}.kss %{APPNAMELC}_kss_SOURCES = %{APPNAMELC}ui.ui %{APPNAMELC}.cpp -%{APPNAMELC}_kss_LDADD = $(LIB_QT) $(LIB_KDECORE) $(LDADD) $(LIB_KSYCOCA) +%{APPNAMELC}_kss_LDADD = $(LIB_QT) $(LIB_TDECORE) $(LDADD) $(LIB_KSYCOCA) #datadir = $(kde_datadir)/%{APPNAMELC} diff --git a/languages/cpp/app_templates/kxt/src-Makefile.am b/languages/cpp/app_templates/kxt/src-Makefile.am index 737b7399..529fe0ef 100644 --- a/languages/cpp/app_templates/kxt/src-Makefile.am +++ b/languages/cpp/app_templates/kxt/src-Makefile.am @@ -14,7 +14,7 @@ METASOURCES = AUTO %{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) # the libraries to link against. -%{APPNAMELC}_LDADD = $(LIB_KFILE) $(LIB_KDEPRINT) +%{APPNAMELC}_LDADD = $(LIB_KFILE) $(LIB_TDEPRINT) # which sources should be compiled for %{APPNAMELC} %{APPNAMELC}_SOURCES = settings.kcfgc main.cpp %{APPNAMELC}.cpp %{APPNAMELC}view.cpp \ diff --git a/languages/lib/debugger/Makefile.am b/languages/lib/debugger/Makefile.am index 63476ada..34e277b7 100644 --- a/languages/lib/debugger/Makefile.am +++ b/languages/lib/debugger/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces $(all_includes) METASOURCES = AUTO lib_LTLIBRARIES = liblang_debugger.la liblang_debugger_la_LDFLAGS = $(all_libraries) -liblang_debugger_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KPARTS) -lktexteditor +liblang_debugger_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_KPARTS) -lktexteditor liblang_debugger_la_SOURCES = kdevdebugger.cpp debugger.cpp langincludedirdir = $(includedir)/kdevelop/languages/debugger langincludedir_HEADERS = debugger.h kdevdebugger.h diff --git a/languages/lib/designer_integration/Makefile.am b/languages/lib/designer_integration/Makefile.am index fd14d21e..182ff9ad 100644 --- a/languages/lib/designer_integration/Makefile.am +++ b/languages/lib/designer_integration/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ METASOURCES = AUTO libdesignerintegration_la_LDFLAGS = $(all_libraries) lib_LTLIBRARIES = libdesignerintegration.la -libdesignerintegration_la_LIBADD = $(top_builddir)/lib/interfaces/libkdevinterfaces.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) +libdesignerintegration_la_LIBADD = $(top_builddir)/lib/interfaces/libkdevinterfaces.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) libdesignerintegration_la_SOURCES = implementationwidgetbase.ui \ implementationwidget.cpp qtdesignerintegration.cpp diff --git a/languages/ruby/app_templates/kapp/src-Makefile.am b/languages/ruby/app_templates/kapp/src-Makefile.am index ad999e1c..84f68b4b 100644 --- a/languages/ruby/app_templates/kapp/src-Makefile.am +++ b/languages/ruby/app_templates/kapp/src-Makefile.am @@ -11,7 +11,7 @@ INCLUDES = $(all_includes) -I$(RUBY_ARCHDIR) %{APPNAMELC}_LDFLAGS = $(all_libraries) $(KDE_RPATH) -L$(RUBY_LIBDIR) # the libraries to link against. -%{APPNAMELC}_LDADD = $(LIB_KFILE) $(LIB_KDEPRINT) $(RUBY_LIBRUBYARG) +%{APPNAMELC}_LDADD = $(LIB_KFILE) $(LIB_TDEPRINT) $(RUBY_LIBRUBYARG) # which sources should be compiled for %{APPNAMELC} %{APPNAMELC}_SOURCES = %{APPNAMELC}.cpp diff --git a/languages/ruby/app_templates/kxt/src-Makefile.am b/languages/ruby/app_templates/kxt/src-Makefile.am index e121d0bc..74622a8d 100644 --- a/languages/ruby/app_templates/kxt/src-Makefile.am +++ b/languages/ruby/app_templates/kxt/src-Makefile.am @@ -11,7 +11,7 @@ INCLUDES = $(all_includes) -I$(RUBY_ARCHDIR) %{APPNAMELC}_LDFLAGS = $(all_libraries) $(KDE_RPATH) -L$(RUBY_LIBDIR) # the libraries to link against. -%{APPNAMELC}_LDADD = $(LIB_KFILE) $(LIB_KDEPRINT) $(RUBY_LIBRUBYARG) +%{APPNAMELC}_LDADD = $(LIB_KFILE) $(LIB_TDEPRINT) $(RUBY_LIBRUBYARG) # which sources should be compiled for %{APPNAMELC} %{APPNAMELC}_SOURCES = %{APPNAMELC}.cpp diff --git a/lib/catalog/Makefile.am b/lib/catalog/Makefile.am index 1e2a19f6..30a0a1e4 100644 --- a/lib/catalog/Makefile.am +++ b/lib/catalog/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = $(all_includes) $(DB3INCLUDES) lib_LTLIBRARIES = libkdevcatalog.la libkdevcatalog_la_SOURCES = tag.cpp catalog.cpp libkdevcatalog_la_LDFLAGS = -no-undefined $(all_libraries) $(DB3LDFLAGS) -libkdevcatalog_la_LIBADD = -l$(DB3LIB) $(LIB_KDECORE) $(LIB_QT) +libkdevcatalog_la_LIBADD = -l$(DB3LIB) $(LIB_TDECORE) $(LIB_QT) kdevcatalogincludedir = $(includedir)/kdevelop/catalog kdevcataloginclude_HEADERS = catalog.h tag.h diff --git a/lib/cppparser/Makefile.am b/lib/cppparser/Makefile.am index 1ee03ce7..f420f757 100644 --- a/lib/cppparser/Makefile.am +++ b/lib/cppparser/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces $(all_includes) AM_CXXFLAGS = -DKDEVELOP_BGPARSER lib_LTLIBRARIES = libkdevcppparser.la libkdevcppparser_la_LDFLAGS = $(all_libraries) -libkdevcppparser_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/lib/interfaces/libkdevinterfaces.la -lDCOP $(LIB_KDEUI) $(LIB_KPARTS) -lktexteditor $(LIB_KIO) -lkscript +libkdevcppparser_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/lib/interfaces/libkdevinterfaces.la -lDCOP $(LIB_TDEUI) $(LIB_KPARTS) -lktexteditor $(LIB_KIO) -lkscript libkdevcppparser_la_SOURCES = ast.cpp cachemanager.cpp driver.cpp errors.cpp \ lexer.cpp lexercache.cpp lookup.cpp parser.cpp tree_parser.cpp diff --git a/lib/interfaces/Makefile.am b/lib/interfaces/Makefile.am index 936966eb..ecb318c4 100644 --- a/lib/interfaces/Makefile.am +++ b/lib/interfaces/Makefile.am @@ -14,7 +14,7 @@ libkdevinterfaces_la_SOURCES = kdevcore.cpp kdevproject.cpp \ libkdevinterfaces_la_LDFLAGS = -no-undefined $(all_libraries) libkdevinterfaces_la_LIBADD = $(top_builddir)/lib/interfaces/external/libkinterfacedesigner.la \ $(top_builddir)/lib/util/libkdevutil.la \ - $(LIB_KDEUI) $(LIB_KHTML) $(LIB_KPARTS) -lktexteditor -lkscript -lDCOP + $(LIB_TDEUI) $(LIB_KHTML) $(LIB_KPARTS) -lktexteditor -lkscript -lDCOP kdevelopincludedir = $(includedir)/kdevelop/interfaces kdevelopinclude_HEADERS = kdevlanguagesupport.h kdevmainwindow.h \ diff --git a/lib/interfaces/external/Makefile.am b/lib/interfaces/external/Makefile.am index 2bfe3b9d..63e15465 100644 --- a/lib/interfaces/external/Makefile.am +++ b/lib/interfaces/external/Makefile.am @@ -6,7 +6,7 @@ kinterfacedesignerdir = $(includedir)/kinterfacedesigner kinterfacedesigner_HEADERS = designer.h lib_LTLIBRARIES = libkinterfacedesigner.la -libkinterfacedesigner_la_LIBADD = $(LIB_QT) $(LIB_KPARTS) $(LIB_KDEUI) +libkinterfacedesigner_la_LIBADD = $(LIB_QT) $(LIB_KPARTS) $(LIB_TDEUI) libkinterfacedesigner_la_LDFLAGS = $(all_libraries) libkinterfacedesigner_la_SOURCES = designer.cpp diff --git a/parts/documentation/interfaces/Makefile.am b/parts/documentation/interfaces/Makefile.am index 72c5afd2..e0de7668 100644 --- a/parts/documentation/interfaces/Makefile.am +++ b/parts/documentation/interfaces/Makefile.am @@ -4,7 +4,7 @@ METASOURCES = AUTO partincludedirdir = $(includedir)/kdevelop/parts/documentation lib_LTLIBRARIES = libdocumentation_interfaces.la libdocumentation_interfaces_la_LDFLAGS = $(all_libraries) -libdocumentation_interfaces_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) +libdocumentation_interfaces_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) libdocumentation_interfaces_la_SOURCES = kdevdocumentationplugin.cpp partincludedir_HEADERS = kdevdocumentationplugin.h servicetypedir = $(kde_servicetypesdir) diff --git a/parts/documentation/tools/htdig/Makefile.am b/parts/documentation/tools/htdig/Makefile.am index b9630ad2..f69a7b30 100644 --- a/parts/documentation/tools/htdig/Makefile.am +++ b/parts/documentation/tools/htdig/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes) METASOURCES = AUTO bin_PROGRAMS = kdevelop-htdig -kdevelop_htdig_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kdevelop_htdig_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kdevelop_htdig_SOURCES = htdigindex.cpp noinst_HEADERS = htdigindex.h diff --git a/src/Makefile.am b/src/Makefile.am index 3d4e15c8..e88cddfe 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,7 +24,7 @@ bin_PROGRAMS = kdevelop kdevassistant kdevelop_SOURCES = main.cpp kdevideextension.cpp settingswidget.ui kdevelop_METASOURCES = AUTO -kdevelop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lkdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner +kdevelop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lkdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner kdevelop_LDADD = libkdevshell.la -L../lib/interfaces/external/.libs -lkinterfacedesigner rcdir = $(kde_datadir)/kdevelop @@ -35,7 +35,7 @@ kdevelopdatadir = $(kde_confdir) kdevelopdata_DATA = kdeveloprc kdevassistantrc SUBDIRS = profiles profileengine newui kconf_update -kdevassistant_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lkdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner +kdevassistant_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lkdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner kdevassistant_SOURCES = main_assistant.cpp kdevassistantextension.cpp kdevassistant_LDADD = libkdevshell.la -L../lib/interfaces/external/.libs -lkinterfacedesigner diff --git a/src/kconf_update/Makefile.am b/src/kconf_update/Makefile.am index ee748ca1..7b072c71 100644 --- a/src/kconf_update/Makefile.am +++ b/src/kconf_update/Makefile.am @@ -11,7 +11,7 @@ kconf_PROGRAMS = kdev-gen-settings-kconf_update kconfdir = $(libdir)/kconf_update_bin kdev_gen_settings_kconf_update_SOURCES = kdev-gen-settings-kconf_update.cpp -kdev_gen_settings_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kdev_gen_settings_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kdev_gen_settings_kconf_update_LDADD = $(LIB_QT) # vim: set noet: diff --git a/src/newui/Makefile.am b/src/newui/Makefile.am index b99b17e4..f0350311 100644 --- a/src/newui/Makefile.am +++ b/src/newui/Makefile.am @@ -11,4 +11,4 @@ libd_la_LDFLAGS = $(all_libraries) noinst_HEADERS = dmainwindow.h ddockwindow.h buttonbar.h button.h comdefs.h docksplitter.h dtabwidget.h libd_la_SOURCES = dmainwindow.cpp buttonbar.cpp \ button.cpp ddockwindow.cpp docksplitter.cpp dtabwidget.cpp -libd_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) +libd_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) diff --git a/src/profileengine/editor/Makefile.am b/src/profileengine/editor/Makefile.am index c83169cd..987eaed2 100644 --- a/src/profileengine/editor/Makefile.am +++ b/src/profileengine/editor/Makefile.am @@ -16,7 +16,7 @@ bin_PROGRAMS = kdevprofileeditor kdevprofileeditor_LDFLAGS = $(all_libraries) kdevprofileeditor_LDADD = \ $(top_builddir)/src/profileengine/lib/libprofileengine.la libprofileeditor.la \ - $(LIB_KDEUI) $(LIB_KIO) + $(LIB_TDEUI) $(LIB_KIO) kdevprofileeditor_SOURCES = main.cpp diff --git a/src/profileengine/lib/Makefile.am b/src/profileengine/lib/Makefile.am index 6f589224..967736eb 100644 --- a/src/profileengine/lib/Makefile.am +++ b/src/profileengine/lib/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/lib/external_interfaces \ METASOURCES = AUTO lib_LTLIBRARIES = libprofileengine.la libprofileengine_la_LDFLAGS = $(all_libraries) -libprofileengine_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KIO) +libprofileengine_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_KIO) libprofileengine_la_SOURCES = profileengine.cpp profile.cpp profileincludedir = $(includedir)/kdevelop/shell/profileengine