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

pull/1/head
Timothy Pearson 11 years ago
parent c624bc4eb9
commit e803d90d54

@ -7,7 +7,7 @@ bin_PROGRAMS = kmfsystray
kmfsystray_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kmfsystray_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kmfsystray_LDADD = ../kmyfirewall/core/libkmfcore.la ../kmyfirewall/kmfwidgets/libkmfwidgets.la $(LIB_TDEUI) $(LIB_KPARTS)
kmfsystray_DATA = kmfsystray.desktop

@ -31,7 +31,7 @@ ToDo
----
*) Single root password input (e.g. kwallet support)
*) Single root password input (e.g. tdewallet support)
*) Implement logfile parsing and display

@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc")
AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts")
AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-lkutils")
AC_SUBST(LIB_KUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lkdnssd")
AC_SUBST(LIB_KUNITTEST, "-lkunittest")
AC_SUBST(LIB_KDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
# these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio")
AC_SUBST(LIB_KFILE, "-lkio")
@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-lksycoca")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts")
AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
test "x$jpeg_incdir" = xNO && jpeg_incdir=
dnl if headers _and_ libraries are missing, this is no error, and we
dnl continue with a warning (the user will get no jpeg support in khtml)
dnl continue with a warning (the user will get no jpeg support in tdehtml)
dnl if only one is missing, it means a configuration error, but we still
dnl only warn
if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
AC_SUBST(KDE_PLUGIN)
# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
AC_SUBST(KDE_CHECK_PLUGIN)

@ -159,19 +159,19 @@ LIB_KDED =
LIB_TDEPIM = -ltdepim
LIB_TDEPRINT = -ltdeprint
LIB_TDEUI = -ltdeui
LIB_KDNSSD = -lkdnssd
LIB_KDNSSD = -ltdednssd
LIB_KFILE = -lkio
LIB_KFM =
LIB_KHTML = -lkhtml
LIB_KIMPROXY = -lkimproxy
LIB_KHTML = -ltdehtml
LIB_KIMPROXY = -ltdeimproxy
LIB_KIO = -lkio
LIB_KJS = -lkjs
LIB_KNEWSTUFF = -lknewstuff
LIB_KPARTS = -lkparts
LIB_KSPELL = -lkspell
LIB_KPARTS = -ltdeparts
LIB_KSPELL = -ltdespell
LIB_KSYCOCA = -lkio
LIB_KUNITTEST = -lkunittest
LIB_KUTILS = -lkutils
LIB_KUNITTEST = -ltdeunittest
LIB_KUTILS = -ltdeutils
LIB_POLL =
LIB_QPE =
LIB_QT = -lqt-mt $(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread

@ -143,19 +143,19 @@ LIB_KDED =
LIB_TDEPIM = -ltdepim
LIB_TDEPRINT = -ltdeprint
LIB_TDEUI = -ltdeui
LIB_KDNSSD = -lkdnssd
LIB_KDNSSD = -ltdednssd
LIB_KFILE = -lkio
LIB_KFM =
LIB_KHTML = -lkhtml
LIB_KIMPROXY = -lkimproxy
LIB_KHTML = -ltdehtml
LIB_KIMPROXY = -ltdeimproxy
LIB_KIO = -lkio
LIB_KJS = -lkjs
LIB_KNEWSTUFF = -lknewstuff
LIB_KPARTS = -lkparts
LIB_KSPELL = -lkspell
LIB_KPARTS = -ltdeparts
LIB_KSPELL = -ltdespell
LIB_KSYCOCA = -lkio
LIB_KUNITTEST = -lkunittest
LIB_KUTILS = -lkutils
LIB_KUNITTEST = -ltdeunittest
LIB_KUTILS = -ltdeutils
LIB_POLL =
LIB_QPE =
LIB_QT = -lqt-mt $(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread

@ -987,9 +987,9 @@ uninstall-local:
#include "../../interfaces/kmfruleoptioneditinterface.h"
// KDE includes
#include <kparts/part.h>
#include <kparts/plugin.h>
#include <kparts/factory.h>
#include <tdeparts/part.h>
#include <tdeparts/plugin.h>
#include <tdeparts/factory.h>
#include <kxmlgui.h>
#include <qstring.h>

@ -11,7 +11,7 @@ METASOURCES = AUTO
#########################################################################
bin_PROGRAMS = kmyfirewall
kmyfirewall_SOURCES = kmfconfigdialog.cpp kmyfirewall.cpp main.cpp
kmyfirewall_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kmyfirewall_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kmyfirewall_LDADD = kmfwidgets/libkmfwidgets.la \
core/libkmfcore.la $(LIB_KPARTS)

@ -23,9 +23,9 @@
#include <tqobject.h>
// KDE includes
#include <kparts/part.h>
#include <kparts/plugin.h>
#include <kparts/factory.h>
#include <tdeparts/part.h>
#include <tdeparts/plugin.h>
#include <tdeparts/factory.h>
#include <kxmlgui.h>
// Project includes

@ -21,9 +21,9 @@
#include <tqtextstream.h>
// KDE includes
#include <kparts/part.h>
#include <kparts/plugin.h>
#include <kparts/factory.h>
#include <tdeparts/part.h>
#include <tdeparts/plugin.h>
#include <tdeparts/factory.h>
#include <kxmlgui.h>
namespace KMF {

@ -24,9 +24,9 @@
#include <tqvaluelist.h>
// KDE includes
#include <kparts/part.h>
#include <kparts/plugin.h>
#include <kparts/factory.h>
#include <tdeparts/part.h>
#include <tdeparts/plugin.h>
#include <tdeparts/factory.h>
#include <kxmlgui.h>
// Project includes

@ -21,9 +21,9 @@
#include <tqtextstream.h>
// KDE includes
#include <kparts/part.h>
#include <kparts/plugin.h>
#include <kparts/factory.h>
#include <tdeparts/part.h>
#include <tdeparts/plugin.h>
#include <tdeparts/factory.h>
#include <kxmlgui.h>
namespace KMF {

@ -21,7 +21,7 @@
#include <tqobject.h>
// KDE Includes
#include <kparts/plugin.h>
#include <tdeparts/plugin.h>
namespace KMF {

@ -23,7 +23,7 @@
<default>true</default>
</entry>
<entry name="UseSSHForLocalhost" type="Bool">
<label>Use SSH for localhost Execution, enables password keeping, kwallet support</label>
<label>Use SSH for localhost Execution, enables password keeping, tdewallet support</label>
<default>false</default>
</entry>
<entry name="OS" type="String">

@ -34,9 +34,9 @@
// kde includes
#include <kurl.h>
#include <kparts/part.h>
#include <kparts/plugin.h>
#include <kparts/factory.h>
#include <tdeparts/part.h>
#include <tdeparts/plugin.h>
#include <tdeparts/factory.h>
//project includes
#include "iptchain.h"

@ -18,7 +18,7 @@ class TQWidget;
#include <tqobject.h>
// KDE includes
#include <kparts/plugin.h>
#include <tdeparts/plugin.h>
// Project includes

@ -17,9 +17,9 @@
// KDE includes
#include <kparts/part.h>
#include <kparts/plugin.h>
#include <kparts/factory.h>
#include <tdeparts/part.h>
#include <tdeparts/plugin.h>
#include <tdeparts/factory.h>
#include <kmessagebox.h>
#include <kdebug.h>
#include <ktrader.h>

@ -20,9 +20,9 @@
#include <tqptrlist.h>
#include <tqvaluelist.h>
// KDE includes
// #include <kparts>
#include <kparts/part.h>
#include <kparts/mainwindow.h>
// #include <tdeparts>
#include <tdeparts/part.h>
#include <tdeparts/mainwindow.h>
class TQObject;
namespace KMF {

@ -25,7 +25,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001
#include <kaboutdata.h>
#include <kmessagebox.h>
#include <kiconloader.h>
#include <kparts/genericfactory.h>
#include <tdeparts/genericfactory.h>
// Project includes
#include "kmfgenericinterface.h"

@ -15,8 +15,8 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001
#define __kmfgenericinterface_part_h__
#include <klibloader.h>
#include <kparts/part.h>
#include <kparts/factory.h>
#include <tdeparts/part.h>
#include <tdeparts/factory.h>
class TDEInstance;
class TDEAboutData;

@ -16,9 +16,9 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001
#include <tqstring.h>
#include <kparts/part.h>
#include <kparts/plugin.h>
#include <kparts/factory.h>
#include <tdeparts/part.h>
#include <tdeparts/plugin.h>
#include <tdeparts/factory.h>
#include <kxmlgui.h>
// Project Includes

@ -18,9 +18,9 @@
#include <tqpixmap.h>
#include <tqstringlist.h>
#include <kparts/part.h>
#include <kparts/plugin.h>
#include <kparts/factory.h>
#include <tdeparts/part.h>
#include <tdeparts/plugin.h>
#include <tdeparts/factory.h>
#include <kxmlgui.h>

@ -197,19 +197,19 @@ LIB_KDED =
LIB_TDEPIM = -ltdepim
LIB_TDEPRINT = -ltdeprint
LIB_TDEUI = -ltdeui
LIB_KDNSSD = -lkdnssd
LIB_KDNSSD = -ltdednssd
LIB_KFILE = -lkio
LIB_KFM =
LIB_KHTML = -lkhtml
LIB_KIMPROXY = -lkimproxy
LIB_KHTML = -ltdehtml
LIB_KIMPROXY = -ltdeimproxy
LIB_KIO = -lkio
LIB_KJS = -lkjs
LIB_KNEWSTUFF = -lknewstuff
LIB_KPARTS = -lkparts
LIB_KSPELL = -lkspell
LIB_KPARTS = -ltdeparts
LIB_KSPELL = -ltdespell
LIB_KSYCOCA = -lkio
LIB_KUNITTEST = -lkunittest
LIB_KUTILS = -lkutils
LIB_KUNITTEST = -ltdeunittest
LIB_KUTILS = -ltdeutils
LIB_POLL =
LIB_QPE =
LIB_QT = -lqt-mt $(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread

@ -18,9 +18,9 @@
#include <tqpixmap.h>
#include <tqstringlist.h>
#include <kparts/part.h>
#include <kparts/plugin.h>
#include <kparts/factory.h>
#include <tdeparts/part.h>
#include <tdeparts/plugin.h>
#include <tdeparts/factory.h>
#include <kxmlgui.h>

@ -13,8 +13,8 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001
#ifndef _KMFIPTEDITORPART_H_
#define _KMFIPTEDITORPART_H_
#include <kparts/part.h>
#include <kparts/factory.h>
#include <tdeparts/part.h>
#include <tdeparts/factory.h>
class TQWidget;
class TQPainter;

@ -26,9 +26,9 @@ email : chubinger@irrsinnig.org
#include <kpushbutton.h>
#include <kcombobox.h>
#include <ktrader.h>
#include <kparts/part.h>
#include <kparts/plugin.h>
#include <kparts/factory.h>
#include <tdeparts/part.h>
#include <tdeparts/plugin.h>
#include <tdeparts/factory.h>
//QT includes
#include <tqtooltip.h>

@ -39,9 +39,9 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2004
#include <kmessagebox.h>
#include <klistview.h>
#include <ktrader.h>
#include <kparts/part.h>
#include <kparts/plugin.h>
#include <kparts/factory.h>
#include <tdeparts/part.h>
#include <tdeparts/plugin.h>
#include <tdeparts/factory.h>
// Project includes

@ -29,9 +29,9 @@
#include <kio/netaccess.h>
#include <kapplication.h>
#include <ktrader.h>
#include <kparts/part.h>
#include <kparts/plugin.h>
#include <kparts/factory.h>
#include <tdeparts/part.h>
#include <tdeparts/plugin.h>
#include <tdeparts/factory.h>
// Project includes

@ -22,7 +22,7 @@
#ifndef KMFMAINWINDOW_H
#define KMFMAINWINDOW_H
#include <kparts/mainwindow.h>
#include <tdeparts/mainwindow.h>
#include "../core/kmyfirewallinterface.h"
#include "../core/netfilterobject.h"

@ -44,7 +44,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2004
#include <kfileitem.h>
#include <klibloader.h>
#include <ktextedit.h>
#include <kparts/partmanager.h>
#include <tdeparts/partmanager.h>
#include <kpushbutton.h>
#include <kedittoolbar.h>

@ -29,8 +29,8 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2004
#include <kprocess.h>
#include <kconfig.h>
#include <kurl.h>
#include <kparts/mainwindow.h>
#include <kparts/dockmainwindow.h>
#include <tdeparts/mainwindow.h>
#include <tdeparts/dockmainwindow.h>
#include <ktempfile.h>
// Project includes

@ -31,7 +31,7 @@
// KDE includes
#include <kdebug.h>
#include <klocale.h>
#include <kparts/genericfactory.h>
#include <tdeparts/genericfactory.h>
// Project includes
#include "../../core/iptrule.h"

@ -32,9 +32,9 @@
#include <tqstring.h>
// KDE includes
#include <kparts/part.h>
#include <kparts/plugin.h>
#include <kparts/factory.h>
#include <tdeparts/part.h>
#include <tdeparts/plugin.h>
#include <tdeparts/factory.h>
#include <kxmlgui.h>
class TDEInstance;

@ -15,9 +15,9 @@
#include "../../core/kmfruleoptioneditinterface.h"
// KDE includes
#include <kparts/part.h>
#include <kparts/plugin.h>
#include <kparts/factory.h>
#include <tdeparts/part.h>
#include <tdeparts/plugin.h>
#include <tdeparts/factory.h>
#include <kxmlgui.h>
class TDEInstance;

@ -27,9 +27,9 @@
#include "../../core/kmfruleoptioneditinterface.h"
// KDE includes
#include <kparts/part.h>
#include <kparts/plugin.h>
#include <kparts/factory.h>
#include <tdeparts/part.h>
#include <tdeparts/plugin.h>
#include <tdeparts/factory.h>
#include <kxmlgui.h>
class TDEInstance;
namespace KMF {

@ -27,9 +27,9 @@
#include "../../core/kmfruleoptioneditinterface.h"
// KDE includes
#include <kparts/part.h>
#include <kparts/plugin.h>
#include <kparts/factory.h>
#include <tdeparts/part.h>
#include <tdeparts/plugin.h>
#include <tdeparts/factory.h>
#include <kxmlgui.h>
class TDEInstance;
namespace KMF {

@ -15,9 +15,9 @@
#include "../../core/kmfruletargetoptioneditinterface.h"
// KDE includes
#include <kparts/part.h>
#include <kparts/plugin.h>
#include <kparts/factory.h>
#include <tdeparts/part.h>
#include <tdeparts/plugin.h>
#include <tdeparts/factory.h>
#include <kxmlgui.h>
class TDEInstance;
namespace KMF {

@ -27,9 +27,9 @@
#include "../../core/kmfruleoptioneditinterface.h"
// KDE includes
#include <kparts/part.h>
#include <kparts/plugin.h>
#include <kparts/factory.h>
#include <tdeparts/part.h>
#include <tdeparts/plugin.h>
#include <tdeparts/factory.h>
#include <kxmlgui.h>
#include <tqstring.h>

@ -15,9 +15,9 @@
#include "../../core/kmfruletargetoptioneditinterface.h"
// KDE includes
#include <kparts/part.h>
#include <kparts/plugin.h>
#include <kparts/factory.h>
#include <tdeparts/part.h>
#include <tdeparts/plugin.h>
#include <tdeparts/factory.h>
#include <kxmlgui.h>
class TDEInstance;

@ -27,9 +27,9 @@
#include "../../core/kmfruletargetoptioneditinterface.h"
// KDE includes
#include <kparts/part.h>
#include <kparts/plugin.h>
#include <kparts/factory.h>
#include <tdeparts/part.h>
#include <tdeparts/plugin.h>
#include <tdeparts/factory.h>
#include <kxmlgui.h>
class TDEInstance;
namespace KMF {

@ -27,9 +27,9 @@
#include "../../core/kmfruleoptioneditinterface.h"
// KDE includes
#include <kparts/part.h>
#include <kparts/plugin.h>
#include <kparts/factory.h>
#include <tdeparts/part.h>
#include <tdeparts/plugin.h>
#include <tdeparts/factory.h>
#include <kxmlgui.h>
class TDEInstance;

@ -27,9 +27,9 @@
#include "../../core/kmfruleoptioneditinterface.h"
// KDE includes
#include <kparts/part.h>
#include <kparts/plugin.h>
#include <kparts/factory.h>
#include <tdeparts/part.h>
#include <tdeparts/plugin.h>
#include <tdeparts/factory.h>
#include <kxmlgui.h>
class TDEInstance;
namespace KMF {

@ -27,9 +27,9 @@
#include "../../core/kmfruleoptioneditinterface.h"
// KDE includes
#include <kparts/part.h>
#include <kparts/plugin.h>
#include <kparts/factory.h>
#include <tdeparts/part.h>
#include <tdeparts/plugin.h>
#include <tdeparts/factory.h>
#include <kxmlgui.h>
class TDEInstance;
namespace KMF {

@ -15,9 +15,9 @@
#include "../../core/kmfruletargetoptioneditinterface.h"
// KDE includes
#include <kparts/part.h>
#include <kparts/plugin.h>
#include <kparts/factory.h>
#include <tdeparts/part.h>
#include <tdeparts/plugin.h>
#include <tdeparts/factory.h>
#include <kxmlgui.h>
class TDEInstance;
namespace KMF {

Loading…
Cancel
Save