diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:15:15 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:15:15 -0600 |
| commit | 06ad876fe1444e1263c2eeaf4864eaf15718797b (patch) | |
| tree | 78ef2ab30e3733ced3989d29017e44387e0c2e0b | |
| parent | fadf12ddbd394c32ecb6fb46ef230f08875c1fec (diff) | |
| download | tdeadmin-06ad876fe1444e1263c2eeaf4864eaf15718797b.tar.gz tdeadmin-06ad876fe1444e1263c2eeaf4864eaf15718797b.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
| -rw-r--r-- | kcron/Makefile.am | 2 | ||||
| -rw-r--r-- | kdat/Makefile.am | 2 | ||||
| -rw-r--r-- | kpackage/Makefile.am | 2 | ||||
| -rw-r--r-- | ksysv/Makefile.am | 2 | ||||
| -rw-r--r-- | kuser/Makefile.am | 4 | ||||
| -rw-r--r-- | kuser/kuserldap.cpp | 2 | ||||
| -rw-r--r-- | secpolicy/Makefile.am | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/kcron/Makefile.am b/kcron/Makefile.am index 7fc35f4..441ffa4 100644 --- a/kcron/Makefile.am +++ b/kcron/Makefile.am @@ -97,7 +97,7 @@ INCLUDES= $(all_includes) kcron_METASOURCES = AUTO -kcron_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kcron_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kcron.pot diff --git a/kdat/Makefile.am b/kdat/Makefile.am index ad4f1e4..e24017d 100644 --- a/kdat/Makefile.am +++ b/kdat/Makefile.am @@ -63,7 +63,7 @@ kdat_SOURCES = \ # the library search path -kdat_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kdat_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, # that depend on the following ones. diff --git a/kpackage/Makefile.am b/kpackage/Makefile.am index 1944403..04939be 100644 --- a/kpackage/Makefile.am +++ b/kpackage/Makefile.am @@ -20,7 +20,7 @@ kpackage_SOURCES = kpackage.cpp managementWidget.cpp packageDisplay.cpp \ kpackage_METASOURCES = AUTO # the library search path -kpackage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kpackage_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, # that depend on the following ones. diff --git a/ksysv/Makefile.am b/ksysv/Makefile.am index fafbe9f..bb2573a 100644 --- a/ksysv/Makefile.am +++ b/ksysv/Makefile.am @@ -38,7 +38,7 @@ ksysv_SOURCES = main.cpp \ # the library search path ksysv_METASOURCES = AUTO -ksysv_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +ksysv_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor ksysv_LDADD = $(LIB_KFILE) -ltdeprint # this option you can leave out. Just, if you use "make dist", you need it diff --git a/kuser/Makefile.am b/kuser/Makefile.am index 6f93a48..6b1222a 100644 --- a/kuser/Makefile.am +++ b/kuser/Makefile.am @@ -3,8 +3,8 @@ INCLUDES = -I.. -I$(top_srcdir)/kuser $(all_includes) # May be -D_XU_QUOTA -D_XU_SHADOW #AM_CXXFLAGS = $(KU_NIS) $(KU_QUOTA) $(QUOTACTL) -D_KU_DEBUG -kuser_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -kuser_LDADD = $(LIB_TDEUI) $(LIBCRYPT) $(LIBSHADOW) $(LIBGEN) $(LIB_KABC) -lkntlm +kuser_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kuser_LDADD = $(LIB_TDEUI) $(LIBCRYPT) $(LIBSHADOW) $(LIBGEN) $(LIB_KABC) -ltdentlm ####### Files diff --git a/kuser/kuserldap.cpp b/kuser/kuserldap.cpp index de3aa9d..36de3b4 100644 --- a/kuser/kuserldap.cpp +++ b/kuser/kuserldap.cpp @@ -21,7 +21,7 @@ #include <kdebug.h> #include <kmdcodec.h> #include <kmessagebox.h> -#include <kio/kntlm.h> +#include <kio/tdentlm.h> #include "kglobal_.h" #include "kuserldap.h" diff --git a/secpolicy/Makefile.am b/secpolicy/Makefile.am index 8862d74..36666ad 100644 --- a/secpolicy/Makefile.am +++ b/secpolicy/Makefile.am @@ -4,7 +4,7 @@ METASOURCES = AUTO bin_PROGRAMS = secpolicy secpolicy_SOURCES = main.cpp secpolicywin.cpp pamview.cpp ppitem.cpp secpolicy_LDADD = $(LIB_KIO) -secpolicy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +secpolicy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor noinst_HEADERS = secpolicywin.h pamview.h ppitem.h |