Rename a number of libraries and executables to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 11 years ago
parent 9f2c757e1a
commit fb758f6790

@ -8,7 +8,7 @@ bin_PROGRAMS = blinken
INCLUDES = $(all_includes) INCLUDES = $(all_includes)
blinken_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor blinken_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
blinken_LDADD = $(LIB_TDEUI) $(LIB_KIO) $(artslib) blinken_LDADD = $(LIB_TDEUI) $(LIB_KIO) $(artslib)
blinken_SOURCES = main.cpp blinken.cpp artsplayer.cpp blinkengame.cpp number.cpp highscoredialog.cpp counter.cpp fontutils.cpp fontchecker.cpp button.cpp settings.kcfgc blinken_SOURCES = main.cpp blinken.cpp artsplayer.cpp blinkengame.cpp number.cpp highscoredialog.cpp counter.cpp fontutils.cpp fontchecker.cpp button.cpp settings.kcfgc

@ -79,7 +79,7 @@ rcui_DATA = kalziumui.rc
KDE_ICON = AUTO KDE_ICON = AUTO
# the library search path. # the library search path.
kalzium_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kalzium_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
#this RegExp-monster grep for <name origin=foo">bar</name> and puts the i18n() around foo and bar #this RegExp-monster grep for <name origin=foo">bar</name> and puts the i18n() around foo and bar
messages-old: rc.cpp messages-old: rc.cpp

@ -21,8 +21,8 @@
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <khtml_part.h> #include <tdehtml_part.h>
#include <khtmlview.h> #include <tdehtmlview.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kactioncollection.h> #include <kactioncollection.h>
#include <kcombobox.h> #include <kcombobox.h>

@ -28,7 +28,7 @@ bin_PROGRAMS = kanagram
# the application source, library search path, and link libraries # the application source, library search path, and link libraries
kanagram_SOURCES = main.cpp kanagram.cpp kanagramgame.cpp fontutils.cpp kanagramsettings.kcfgc mainsettingswidget.ui vocabsettingswidget.ui vocabeditwidget.ui mainsettings.cpp vocabsettings.cpp vocabedit.cpp keduvocdocument.cpp keduvocexpression.cpp keduvockvtmlreader.cpp keduvockvtmlwriter.cpp leitnerbox.cpp leitnersystem.cpp multiplechoice.cpp grammarmanager.cpp leitnersystemview.cpp newstuffwidget.ui newstuffdialog.cpp newstuff.cpp kanagram_SOURCES = main.cpp kanagram.cpp kanagramgame.cpp fontutils.cpp kanagramsettings.kcfgc mainsettingswidget.ui vocabsettingswidget.ui vocabeditwidget.ui mainsettings.cpp vocabsettings.cpp vocabedit.cpp keduvocdocument.cpp keduvocexpression.cpp keduvockvtmlreader.cpp keduvockvtmlwriter.cpp leitnerbox.cpp leitnersystem.cpp multiplechoice.cpp grammarmanager.cpp leitnersystemview.cpp newstuffwidget.ui newstuffdialog.cpp newstuff.cpp
kanagram_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kanagram_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kanagram_LDADD = $(LIB_TDEUI) $(LIB_KNEWSTUFF) $(LIB_KIO) $(artslib) kanagram_LDADD = $(LIB_TDEUI) $(LIB_KNEWSTUFF) $(LIB_KIO) $(artslib)
kde_kcfg_DATA=kanagram.kcfg kde_kcfg_DATA=kanagram.kcfg

@ -4,7 +4,7 @@ kbruch_COMPILE_FIRST = version.h
kbruch_SOURCES = exercisebase.cpp taskvieweroptionsbase.ui task.cpp ratio.cpp taskview.cpp statisticsview.cpp primenumber.cpp kbruch.cpp mainqtwidget.cpp taskwidget.cpp fractionbasewidget.cpp resultwidget.cpp exercisecompare.cpp ratiowidget.cpp rationalwidget.cpp exerciseconvert.cpp exercisefactorize.cpp factorizedwidget.cpp settingsclass.kcfgc kbruch_SOURCES = exercisebase.cpp taskvieweroptionsbase.ui task.cpp ratio.cpp taskview.cpp statisticsview.cpp primenumber.cpp kbruch.cpp mainqtwidget.cpp taskwidget.cpp fractionbasewidget.cpp resultwidget.cpp exercisecompare.cpp ratiowidget.cpp rationalwidget.cpp exerciseconvert.cpp exercisefactorize.cpp factorizedwidget.cpp settingsclass.kcfgc
kbruch_LDADD = $(LIB_TDEUI) kbruch_LDADD = $(LIB_TDEUI)
# the library search path. # the library search path.
kbruch_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kbruch_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
EXTRA_DIST = kbruch.cpp kbruch.h kbruch.desktop hi32-app-kbruch.png hi16-app-kbruch.png lo32-app-kbruch.png lo16-app-kbruch.png mainqtwidget.cpp mainqtwidget.h primenumber.cpp primenumber.h statisticsview.cpp statisticsview.h exercisebase.cpp exercisebase.h taskview.cpp taskview.h ratio.cpp ratio.h task.cpp task.h taskwidget.cpp taskwidget.h fractionbasewidget.cpp fractionbasewidget.h resultwidget.cpp resultwidget.h exercisecompare.cpp exercisecompare.h ratiowidget.cpp ratiowidget.h rationalwidget.cpp rationalwidget.h exerciseconvert.cpp exerciseconvert.h exercisefactorize.cpp exercisefactorize.h factorizedwidget.cpp factorizedwidget.h kbruch.rc taskvieweroptionsbase.ui EXTRA_DIST = kbruch.cpp kbruch.h kbruch.desktop hi32-app-kbruch.png hi16-app-kbruch.png lo32-app-kbruch.png lo16-app-kbruch.png mainqtwidget.cpp mainqtwidget.h primenumber.cpp primenumber.h statisticsview.cpp statisticsview.h exercisebase.cpp exercisebase.h taskview.cpp taskview.h ratio.cpp ratio.h task.cpp task.h taskwidget.cpp taskwidget.h fractionbasewidget.cpp fractionbasewidget.h resultwidget.cpp resultwidget.h exercisecompare.cpp exercisecompare.h ratiowidget.cpp ratiowidget.h rationalwidget.cpp rationalwidget.h exerciseconvert.cpp exerciseconvert.h exercisefactorize.cpp exercisefactorize.h factorizedwidget.cpp factorizedwidget.h kbruch.rc taskvieweroptionsbase.ui

@ -5,7 +5,7 @@ kbruch_test_SOURCES = task.cpp ratio.cpp ratio_test.cpp primenumber.cpp primenum
kbruch_test_LDADD = -lboost_unit_test_framework-gcc $(LIB_TDEUI) kbruch_test_LDADD = -lboost_unit_test_framework-gcc $(LIB_TDEUI)
# the library search path. # the library search path.
kbruch_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kbruch_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
EXTRA_DIST = primenumber.cpp primenumber.h ratio.cpp ratio.h task.cpp task.h primenumber_test.cpp ratio_test.cpp kbruch_test.cpp EXTRA_DIST = primenumber.cpp primenumber.h ratio.cpp ratio.h task.cpp task.h primenumber_test.cpp ratio_test.cpp kbruch_test.cpp

@ -26,7 +26,7 @@
#include <kfiledialog.h> #include <kfiledialog.h>
#include <kdebug.h> #include <kdebug.h>
#include <kparts/componentfactory.h> #include <tdeparts/componentfactory.h>
#include <tqlabel.h> #include <tqlabel.h>

@ -25,8 +25,8 @@
*/ */
#include <kapplication.h> #include <kapplication.h>
#include <kparts/mainwindow.h> #include <tdeparts/mainwindow.h>
#include <kparts/part.h> #include <tdeparts/part.h>
#include <kaction.h> #include <kaction.h>
/** The KEduca TestMaster. /** The KEduca TestMaster.

@ -27,7 +27,7 @@
#include "configdialogbase.h" #include "configdialogbase.h"
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kparts/genericfactory.h> #include <tdeparts/genericfactory.h>
#include <kstdaction.h> #include <kstdaction.h>
#include <kconfigdialog.h> #include <kconfigdialog.h>

@ -24,7 +24,7 @@
#ifndef KEDUCA_PART_H #ifndef KEDUCA_PART_H
#define KEDUCA_PART_H #define KEDUCA_PART_H
#include <kparts/part.h> #include <tdeparts/part.h>
class KEducaView; class KEducaView;
class TDEAboutData; class TDEAboutData;

@ -23,7 +23,7 @@ INCLUDES= -I../libkeduca $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO
# the library search path. # the library search path.
keducabuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor keducabuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
# Uncomment the following two lines if you add a ui.rc file for your application to make use of # Uncomment the following two lines if you add a ui.rc file for your application to make use of
# KDE´s XML GUI builing # KDE´s XML GUI builing

@ -2,7 +2,7 @@ INCLUDES=$(all_includes)
noinst_LTLIBRARIES = libkeduca.la noinst_LTLIBRARIES = libkeduca.la
libkeduca_la_SOURCES = kgallerydialogbase.ui fileread.cpp kgallerydialog.cpp libkeduca_la_SOURCES = kgallerydialogbase.ui fileread.cpp kgallerydialog.cpp
libkeduca_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor libkeduca_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
libkeduca_la_LIBADD = -ltdeprint libkeduca_la_LIBADD = -ltdeprint
noinst_HEADERS = fileread.h kgallerydialog.h kgallerydialogbase.h noinst_HEADERS = fileread.h kgallerydialog.h kgallerydialogbase.h

@ -235,7 +235,7 @@ protected slots:
void slotUploadFinished( TDEIO::Job * job ); void slotUploadFinished( TDEIO::Job * job );
signals: signals:
/* Stolen from kparts */ /* Stolen from tdeparts */
/** /**
* Emit this when you have completed loading data. * Emit this when you have completed loading data.

@ -8,7 +8,7 @@ bin_PROGRAMS = kgeography
INCLUDES = $(all_includes) INCLUDES = $(all_includes)
# the library search path. # the library search path.
kgeography_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kgeography_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
# the libraries to link against. # the libraries to link against.
kgeography_LDADD = $(LIB_TDEUI) kgeography_LDADD = $(LIB_TDEUI)

@ -17,7 +17,7 @@ INCLUDES= -I$(top_srcdir)/libtdeedu/tdeeducore $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO
# the library search path. # the library search path.
khangman_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor khangman_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
rc_DATA = khangmanui.rc rc_DATA = khangmanui.rc
rcdir = $(kde_datadir)/khangman rcdir = $(kde_datadir)/khangman

@ -25,7 +25,7 @@ SUBDIRS = \
kde_module_LTLIBRARIES = libkigpart.la kde_module_LTLIBRARIES = libkigpart.la
libkigpart_la_SOURCES = dummy.cpp libkigpart_la_SOURCES = dummy.cpp
libkigpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -lktexteditor libkigpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -ltdetexteditor
libkigpart_la_LIBADD = $(LIB_KPARTS) \ libkigpart_la_LIBADD = $(LIB_KPARTS) \
misc/libmisc.la objects/libobjects.la filters/libfilters.la \ misc/libmisc.la objects/libobjects.la filters/libfilters.la \
modes/libmodes.la kig/libkigparttemp.la $(scriptinglib) modes/libmodes.la kig/libkigparttemp.la $(scriptinglib)

@ -4,7 +4,7 @@ Hi, here are some things that might not be immediately clear :
modes ) ( just in case this wasn't clear.. ) modes ) ( just in case this wasn't clear.. )
- for testing code, i don't really know how you're supposed to do this with - for testing code, i don't really know how you're supposed to do this with
kparts, so i just do a "make install" every time, and then simply run the tdeparts, so i just do a "make install" every time, and then simply run the
program, you prolly want to do "./configure --enable-debug=full program, you prolly want to do "./configure --enable-debug=full
--prefix=/usr/local/trinity" (meanwhile, i found out, the solution is in a --prefix=/usr/local/trinity" (meanwhile, i found out, the solution is in a
developer faq on developer.kde.org developer faq on developer.kde.org

@ -23,7 +23,7 @@ bin_PROGRAMS = kig
# the application source, library search path, and link libraries # the application source, library search path, and link libraries
kig_SOURCES = main.cpp kig.cpp kig_SOURCES = main.cpp kig.cpp
kig_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kig_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kig_LDADD = $(LIB_KPARTS) kig_LDADD = $(LIB_KPARTS)
# this is where the desktop file will go # this is where the desktop file will go

@ -36,7 +36,7 @@
#endif #endif
#include <kapplication.h> #include <kapplication.h>
#include <kparts/mainwindow.h> #include <tdeparts/mainwindow.h>
#include <dcopclient.h> #include <dcopclient.h>
class KToggleAction; class KToggleAction;

@ -58,7 +58,7 @@
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kstdaction.h> #include <kstdaction.h>
#include <ktoolbar.h> #include <ktoolbar.h>
#include <kparts/genericfactory.h> #include <tdeparts/genericfactory.h>
#include <tdeprint/kprintdialogpage.h> #include <tdeprint/kprintdialogpage.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>

@ -24,7 +24,7 @@
#include <tqptrlist.h> #include <tqptrlist.h>
#include <kparts/part.h> #include <tdeparts/part.h>
#include "../objects/common.h" #include "../objects/common.h"

@ -25,7 +25,7 @@
#include <tqwidget.h> #include <tqwidget.h>
#include <tqpixmap.h> #include <tqpixmap.h>
#include <kparts/part.h> #include <tdeparts/part.h>
#include <vector> #include <vector>

@ -32,13 +32,13 @@
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>
#include <ktextedit.h> #include <ktextedit.h>
#include <ktexteditor/clipboardinterface.h> #include <tdetexteditor/clipboardinterface.h>
#include <ktexteditor/dynwordwrapinterface.h> #include <tdetexteditor/dynwordwrapinterface.h>
#include <ktexteditor/editinterface.h> #include <tdetexteditor/editinterface.h>
#include <ktexteditor/editorchooser.h> #include <tdetexteditor/editorchooser.h>
#include <ktexteditor/popupmenuinterface.h> #include <tdetexteditor/popupmenuinterface.h>
#include <ktexteditor/undointerface.h> #include <tdetexteditor/undointerface.h>
#include <ktexteditor/view.h> #include <tdetexteditor/view.h>
#include <assert.h> #include <assert.h>

@ -23,9 +23,9 @@
#include "script-common.h" #include "script-common.h"
#include <ktextedit.h> #include <ktextedit.h>
#include <ktexteditor/document.h> #include <tdetexteditor/document.h>
#include <ktexteditor/highlightinginterface.h> #include <tdetexteditor/highlightinginterface.h>
#include <ktexteditor/view.h> #include <tdetexteditor/view.h>
#include <algorithm> #include <algorithm>

@ -6,7 +6,7 @@ kiten_SOURCES = main.cpp kiten.cpp learn.cpp kloader.cpp ksaver.cpp \
configsearching.ui configlearn.ui configfont.ui configdictionariesbase.ui \ configsearching.ui configlearn.ui configfont.ui configdictionariesbase.ui \
configdictionaries.cpp optiondialog.cpp kitenconfig.kcfgc configdictionaries.cpp optiondialog.cpp kitenconfig.kcfgc
kiten_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kiten_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kiten_LDADD = libkiten.la $(LIB_KIO) kiten_LDADD = libkiten.la $(LIB_KIO)
bin_PROGRAMS = kiten kitengen bin_PROGRAMS = kiten kitengen
@ -23,7 +23,7 @@ libkiteninclude_HEADERS = \
asyndeta.h dict.h widgets.h kromajiedit.h rad.h deinf.h asyndeta.h dict.h widgets.h kromajiedit.h rad.h deinf.h
kitengen_SOURCES = xjdxgen.c kitengen_SOURCES = xjdxgen.c
kitengen_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kitengen_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
METASOURCES = AUTO METASOURCES = AUTO

@ -12,7 +12,7 @@ bin_PROGRAMS = klatin
INCLUDES = $(all_includes) INCLUDES = $(all_includes)
# the library search path. # the library search path.
klatin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor klatin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
# the libraries to link against. # the libraries to link against.
klatin_LDADD = $(LIB_KFILE) $(top_builddir)/libtdeedu/tdeeducore/libtdeeducore.la klatin_LDADD = $(LIB_KFILE) $(top_builddir)/libtdeedu/tdeeducore/libtdeeducore.la

@ -24,7 +24,7 @@ METASOURCES = AUTO
KDE_ICON = AUTO KDE_ICON = AUTO
# the library search path. # the library search path.
klettres_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor klettres_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
messages: rc.cpp messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/klettres.pot; $(XGETTEXT) *.cpp -o $(podir)/klettres.pot;

@ -36,9 +36,9 @@
#include <kfiledialog.h> #include <kfiledialog.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kparts/browserextension.h> #include <tdeparts/browserextension.h>
#include <kparts/part.h> #include <tdeparts/part.h>
#include <kparts/factory.h> #include <tdeparts/factory.h>
#undef GrayScale #undef GrayScale

@ -32,7 +32,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
#include <kparts/mainwindow.h> #include <tdeparts/mainwindow.h>
#include "kmplotIface.h" #include "kmplotIface.h"
#include "kmplotprogress.h" #include "kmplotprogress.h"

@ -30,7 +30,7 @@ METASOURCES = AUTO
# the library search path. # the library search path.
kpercentage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kpercentage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
stringstocpp: stringstocpp:

@ -54,7 +54,7 @@ INCLUDES= -I$(top_srcdir) -Itools -I$(srcdir)/tools $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO
# the library search path. # the library search path.
kstars_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kstars_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
# Uncomment the following two lines if you add a ui.rc file for your application to make use of # Uncomment the following two lines if you add a ui.rc file for your application to make use of
# KDE # KDE

@ -50,7 +50,7 @@ ktouch_SOURCES = ktouchchartwidget.cpp ktouchcoloreditor_dlg.ui \
ktouchutils.cpp main.cpp prefs.kcfgc ktouchcoloreditor.cpp ktouchutils.cpp main.cpp prefs.kcfgc ktouchcoloreditor.cpp
# the library search path. # the library search path.
ktouch_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor ktouch_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
# the libraries to link against. Be aware of the order. First the libraries, # the libraries to link against. Be aware of the order. First the libraries,
# that depend on the following ones. # that depend on the following ones.

@ -18,7 +18,7 @@ The following packages will be REMOVED:
tdelibs4 tdelibs4-doc tdepim tdepim-kfile-plugins tdepim-libs tdeprint tdelibs4 tdelibs4-doc tdepim tdepim-kfile-plugins tdepim-libs tdeprint
kdesktop tdm kfind kgpgcertmanager khelpcenter kicker kitchensync klipper kdesktop tdm kfind kgpgcertmanager khelpcenter kicker kitchensync klipper
kmail kmailcvt kmenuedit knode knotes konqueror konqueror-nsplugins konsole kmail kmailcvt kmenuedit knode knotes konqueror konqueror-nsplugins konsole
kontact korganizer korn kpager kpersonalizer kpilot kscreensaver ksmserver kontact korganizer korn kpager kpersonalizer kpilot tdescreensaver ksmserver
ksplash ksync ksysguard ksysguardd ktip ktnef twin libarts1 libarts1-dev ksplash ksync ksysguard ksysguardd ktip ktnef twin libarts1 libarts1-dev
libartsc0 libkcal2 libtdenetwork2 libkgantt0 libkonq4 libmimelib1 libartsc0 libkcal2 libtdenetwork2 libkgantt0 libkonq4 libmimelib1
x-window-system-core xlibmesa-dri xlibmesa-gl xlibmesa-glu x-window-system-core xlibmesa-dri xlibmesa-gl xlibmesa-glu

@ -4,9 +4,9 @@ INCLUDES = $(all_includes)
SUBDIRS = pics SUBDIRS = pics
# added from kjots # added from kjots
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kturtle_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kturtle_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kturtle_LDADD = $(LIB_TDEUI) $(LIB_KIO) $(LIB_TDEPRINT) $(LIB_KPARTS) -lkatepartinterfaces kturtle_LDADD = $(LIB_TDEUI) $(LIB_KIO) $(LIB_TDEPRINT) $(LIB_KPARTS) -lkatepartinterfaces
KDE_ICON = kturtle KDE_ICON = kturtle

@ -41,16 +41,16 @@
#include <ksavefile.h> #include <ksavefile.h>
#include <kstatusbar.h> #include <kstatusbar.h>
#include <ktexteditor/clipboardinterface.h> #include <tdetexteditor/clipboardinterface.h>
#include <ktexteditor/cursorinterface.h> #include <tdetexteditor/cursorinterface.h>
#include <ktexteditor/editorchooser.h> #include <tdetexteditor/editorchooser.h>
#include <ktexteditor/editinterface.h> #include <tdetexteditor/editinterface.h>
#include <ktexteditor/highlightinginterface.h> #include <tdetexteditor/highlightinginterface.h>
#include <ktexteditor/printinterface.h> #include <tdetexteditor/printinterface.h>
#include <ktexteditor/selectioninterface.h> #include <tdetexteditor/selectioninterface.h>
#include <ktexteditor/undointerface.h> #include <tdetexteditor/undointerface.h>
#include <ktexteditor/viewcursorinterface.h> #include <tdetexteditor/viewcursorinterface.h>
#include <ktexteditor/encodinginterface.h> #include <tdetexteditor/encodinginterface.h>
#include "lexer.h" #include "lexer.h"
#include "settings.h" #include "settings.h"

@ -30,9 +30,9 @@
#include <klineedit.h> #include <klineedit.h>
#include <knuminput.h> #include <knuminput.h>
#include <kparts/mainwindow.h> #include <tdeparts/mainwindow.h>
#include <ktexteditor/editinterface.h> #include <tdetexteditor/editinterface.h>
#include <ktexteditor/view.h> #include <tdetexteditor/view.h>
#include "canvas.h" #include "canvas.h"
#include "dialogs.h" #include "dialogs.h"

@ -19,7 +19,7 @@ INCLUDES= $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO
# the library search path. # the library search path.
kverbos_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kverbos_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
rcdir = $(kde_datadir)/kverbos rcdir = $(kde_datadir)/kverbos
rc_DATA = kverbosui.rc rc_DATA = kverbosui.rc

@ -40,8 +40,8 @@ INCLUDES = -I$(srcdir)/.. -I$(srcdir)/kvt-core -Icommon-dialogs \
bin_PROGRAMS = kvoctrain spotlight2kvtml bin_PROGRAMS = kvoctrain spotlight2kvtml
# the library search path. # the library search path.
kvoctrain_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kvoctrain_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
spotlight2kvtml_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor spotlight2kvtml_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
CLEANFILES = *.i.c CLEANFILES = *.i.c

@ -50,7 +50,7 @@ SUBDIRS = . pics examples
METASOURCES = AUTO METASOURCES = AUTO
# the library search path. # the library search path.
kwordquiz_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kwordquiz_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
rcdir = $(kde_datadir)/kwordquiz rcdir = $(kde_datadir)/kwordquiz
rc_DATA = kwordquizui.rc eventsrc rc_DATA = kwordquizui.rc eventsrc

@ -11,11 +11,11 @@ libextdate_la_LIBADD = $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE)
test_extdate_SOURCES = test_extdate.cc test_extdate_SOURCES = test_extdate.cc
test_extdate_LDADD = libextdate.la test_extdate_LDADD = libextdate.la
test_extdate_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor test_extdate_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
test_extdatepicker_SOURCES = testwidget.cpp main.cpp test_extdatepicker_SOURCES = testwidget.cpp main.cpp
test_extdatepicker_LDADD = libextdate.la test_extdatepicker_LDADD = libextdate.la
test_extdatepicker_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor test_extdatepicker_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
METASOURCES = AUTO METASOURCES = AUTO

@ -12,8 +12,8 @@
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <khtml_part.h> #include <tdehtml_part.h>
#include <khtmlview.h> #include <tdehtmlview.h>
#include <kglobal.h> #include <kglobal.h>
#include <klistview.h> #include <klistview.h>
#include <klistviewsearchline.h> #include <klistviewsearchline.h>

@ -16,7 +16,7 @@
***************************************************************************/ ***************************************************************************/
#include <khtml_part.h> #include <tdehtml_part.h>
#include <kdialogbase.h> #include <kdialogbase.h>
class TQChar; class TQChar;

Loading…
Cancel
Save