Rename additional instances of KDE to TDE

13 years ago · 811f4062a0
parent c0bc00733f
commit 811f4062a0
7 changed files with 19 additions and 19 deletions
--- a/acinclude.m4
+++ b/acinclude.m4
@ -2068,8 +2068,8 @@ if test $kde_qtver = 3; then
               *) lib_kded="" ;;
       esac
   AC_SUBST(LIB_KDED, $lib_kded)
-   AC_SUBST(LIB_KDECORE, "-ltdecore")
-   AC_SUBST(LIB_KDEUI, "-ltdeui")
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
   AC_SUBST(LIB_KIO, "-lkio")
   AC_SUBST(LIB_KJS, "-lkjs")
   AC_SUBST(LIB_SMB, "-lsmb")
@ -2078,9 +2078,9 @@ if test $kde_qtver = 3; then
   AC_SUBST(LIB_KHTML, "-lkhtml")
   AC_SUBST(LIB_KSPELL, "-lkspell")
   AC_SUBST(LIB_KPARTS, "-lkparts")
-   AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
   AC_SUBST(LIB_KUTILS, "-lkutils")
-   AC_SUBST(LIB_KDEPIM, "-ltdepim")
+   AC_SUBST(LIB_TDEPIM, "-ltdepim")
   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
   AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
@ -2089,8 +2089,8 @@ if test $kde_qtver = 3; then
   AC_SUBST(LIB_KSYCOCA, "-lkio")
   AC_SUBST(LIB_KFILE, "-lkio")
 elif test $kde_qtver = 2; then
-   AC_SUBST(LIB_KDECORE, "-ltdecore")
-   AC_SUBST(LIB_KDEUI, "-ltdeui")
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
   AC_SUBST(LIB_KIO, "-lkio")
   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
   AC_SUBST(LIB_SMB, "-lsmb")
@ -2099,13 +2099,13 @@ elif test $kde_qtver = 2; then
   AC_SUBST(LIB_KHTML, "-lkhtml")
   AC_SUBST(LIB_KSPELL, "-lkspell")
   AC_SUBST(LIB_KPARTS, "-lkparts")
-   AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
 else
-   AC_SUBST(LIB_KDECORE, "-ltdecore -lXext $(LIB_QT)")
-   AC_SUBST(LIB_KDEUI, "-ltdeui $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
-   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
+   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
+   AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
+   AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
+   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)")
+   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
 fi
 ])

--- a/kmymoney2/Makefile.am
+++ b/kmymoney2/Makefile.am
@ -4,7 +4,7 @@ bin_PROGRAMS = kmymoney2

 kmymoney2_SOURCES = kmymoneyutils.cpp kstartuplogo.cpp kmymoney2.cpp main.cpp kmymoney2.stub kmymoney2.skel kmymoneysettings.kcfgc kmymoneyglobalsettings.cpp

-kmymoney2_LDADD = $(top_builddir)/kmymoney2/views/libviews.a $(top_builddir)/kmymoney2/reports/libreports.a $(top_builddir)/kmymoney2/wizards/newuserwizard/libnewuserwizard.a $(top_builddir)/kmymoney2/wizards/newaccountwizard/libnewaccountwizard.a $(top_builddir)/kmymoney2/wizards/wizardpages/libwizardpages.a $(top_builddir)/kmymoney2/dialogs/libdialogs.a $(top_builddir)/kmymoney2/dialogs/settings/libsettings.a $(top_builddir)/kmymoney2/widgets/libwidgets.a $(top_builddir)/kmymoney2/converter/libconverter.a $(top_builddir)/kmymoney2/mymoney/storage/libstorage.a $(top_builddir)/kmymoney2/mymoney/libkmm_mymoney.la $(top_builddir)/libkgpgfile/libkgpgfile.la $(top_builddir)/kmymoney2/plugins/interfaces/libinterfaces.a $(top_builddir)/kmymoney2/plugins/libkmm_plugin.la $(top_builddir)/libkdchart/libkmm_kdchart.la dialogs/libdialogs.a $(LIB_KABC) $(LIB_KHTML) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIB_KUTILS)
+kmymoney2_LDADD = $(top_builddir)/kmymoney2/views/libviews.a $(top_builddir)/kmymoney2/reports/libreports.a $(top_builddir)/kmymoney2/wizards/newuserwizard/libnewuserwizard.a $(top_builddir)/kmymoney2/wizards/newaccountwizard/libnewaccountwizard.a $(top_builddir)/kmymoney2/wizards/wizardpages/libwizardpages.a $(top_builddir)/kmymoney2/dialogs/libdialogs.a $(top_builddir)/kmymoney2/dialogs/settings/libsettings.a $(top_builddir)/kmymoney2/widgets/libwidgets.a $(top_builddir)/kmymoney2/converter/libconverter.a $(top_builddir)/kmymoney2/mymoney/storage/libstorage.a $(top_builddir)/kmymoney2/mymoney/libkmm_mymoney.la $(top_builddir)/libkgpgfile/libkgpgfile.la $(top_builddir)/kmymoney2/plugins/interfaces/libinterfaces.a $(top_builddir)/kmymoney2/plugins/libkmm_plugin.la $(top_builddir)/libkdchart/libkmm_kdchart.la dialogs/libdialogs.a $(LIB_KABC) $(LIB_KHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIB_KUTILS)

 SUBDIRS = mymoney widgets dialogs wizards views converter pics icons html templates plugins reports misc

@ -99,7 +99,7 @@ INCLUDES= $(all_includes) -I$(top_srcdir) -I. -I$(top_builddir)/kmymoney2/dialog
 METASOURCES = AUTO

 # the library search path.
-kmymoney2_LDFLAGS = $(all_libraries) $(kde_RPATH) -export-dynamic $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KUTILS)
+kmymoney2_LDFLAGS = $(all_libraries) $(kde_RPATH) -export-dynamic $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KUTILS)

 # Uncomment the following two lines if you add a ui.rc file for your application to make use of
 # KDE
--- a/kmymoney2/plugins/ofximport/Makefile.am
+++ b/kmymoney2/plugins/ofximport/Makefile.am
@ -16,7 +16,7 @@ kmm_ofximport_la_LIBADD = @OFX_LIBS@ dialogs/libdialogs.la ../libkmm_plugin.la .
 # LD flags for the plugin
 # -module says: this is a module, i.e. something you're going to dlopen
 # so e.g. it has no version number like a normal shared lib would have.
-kmm_ofximport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_KHTML) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(LIB_QT) -L../.libs
+kmm_ofximport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_KHTML) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(LIB_QT) -L../.libs

 # rc file containing the GUI for the plugin
 pluginsdir = $(kde_datadir)/kmm_ofximport
--- a/kmymoney2/widgets/Makefile.am
+++ b/kmymoney2/widgets/Makefile.am
@ -68,7 +68,7 @@ kmmwidgets.cpp:	$(srcdir)/kmymoney.widgets
 # Hence the quick hack to include the required objects from the
 # libkmm_mymoney.so directly into libkmymoney.so
 libkmymoney_la_CXXFLAGS = -U_CHECK_MEMORY -DKMM_DESIGNER
-libkmymoney_la_LDFLAGS = `ls ../mymoney/*.lo` $(KDE_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) -rpath $(DESTDIR)$(qt_libraries)/../plugins/designer $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+libkmymoney_la_LDFLAGS = `ls ../mymoney/*.lo` $(KDE_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) -rpath $(DESTDIR)$(qt_libraries)/../plugins/designer $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)

 if INSTALL_QTDESIGNER_SUPPORT
 install-exec-local: libkmymoney.la
--- a/libkdchart/CMakeLists.txt
+++ b/libkdchart/CMakeLists.txt
@ -44,7 +44,7 @@ SET(libkmm_kdchart_la_SOURCES
 KDE3_AUTOMOC(${libkmm_kdchart_la_SOURCES})
 ADD_LIBRARY(kmm_kdchart SHARED ${libkmm_kdchart_la_SOURCES})
 SET_TARGET_PROPERTIES(kmm_kdchart PROPERTIES VERSION 0.0.0 SOVERSION 0)
-TARGET_LINK_LIBRARIES(kmm_kdchart ${QT_AND_KDECORE_LIBS} ${ZLIB_LIBRARIES})
+TARGET_LINK_LIBRARIES(kmm_kdchart ${QT_AND_TDECORE_LIBS} ${ZLIB_LIBRARIES})

 ########### install files ###############
 INSTALL(TARGETS kmm_kdchart 
--- a/libkdchart/Makefile.am
+++ b/libkdchart/Makefile.am
@ -39,7 +39,7 @@ libkmm_kdchart_la_SOURCES = KDChart.cpp 		\
                        #KDChartWrapperFactory.cpp

 libkmm_kdchart_la_LDFLAGS = $(all_libraries) -no-undefined
-libkmm_kdchart_la_LIBADD = $(LIB_QT) $(LIB_KDECORE)
+libkmm_kdchart_la_LIBADD = $(LIB_QT) $(LIB_TDECORE)

 noinst_HEADERS =	KDChart.h 		\
 			KDChartAreaPainter.h	\
--- a/libkgpgfile/Makefile.am
+++ b/libkgpgfile/Makefile.am
@ -5,7 +5,7 @@ METASOURCES = AUTO

 noinst_LTLIBRARIES =  libkgpgfile.la
 libkgpgfile_la_SOURCES = kgpgfile.cpp
-libkgpgfile_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libkgpgfile_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 #libkgpgfile_la_LIBADD = $(top_builddir)/libtdepim/libtdepim.la

 instdir=$(includedir)/kmymoney