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

remotes/gitea/gg-tdeadmin-kcron
Timothy Pearson 12 years ago
parent fadf12ddbd
commit 06ad876fe1

@ -97,7 +97,7 @@ INCLUDES= $(all_includes)
kcron_METASOURCES = AUTO 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 messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kcron.pot $(XGETTEXT) *.cpp -o $(podir)/kcron.pot

@ -63,7 +63,7 @@ kdat_SOURCES = \
# the library search path # 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, # 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.

@ -20,7 +20,7 @@ kpackage_SOURCES = kpackage.cpp managementWidget.cpp packageDisplay.cpp \
kpackage_METASOURCES = AUTO kpackage_METASOURCES = AUTO
# the library search path # 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, # 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.

@ -38,7 +38,7 @@ ksysv_SOURCES = main.cpp \
# the library search path # the library search path
ksysv_METASOURCES = AUTO 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 ksysv_LDADD = $(LIB_KFILE) -ltdeprint
# this option you can leave out. Just, if you use "make dist", you need it # this option you can leave out. Just, if you use "make dist", you need it

@ -3,8 +3,8 @@ INCLUDES = -I.. -I$(top_srcdir)/kuser $(all_includes)
# May be -D_XU_QUOTA -D_XU_SHADOW # May be -D_XU_QUOTA -D_XU_SHADOW
#AM_CXXFLAGS = $(KU_NIS) $(KU_QUOTA) $(QUOTACTL) -D_KU_DEBUG #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_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) -lkntlm kuser_LDADD = $(LIB_TDEUI) $(LIBCRYPT) $(LIBSHADOW) $(LIBGEN) $(LIB_KABC) -ltdentlm
####### Files ####### Files

@ -21,7 +21,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <kmdcodec.h> #include <kmdcodec.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kio/kntlm.h> #include <kio/tdentlm.h>
#include "kglobal_.h" #include "kglobal_.h"
#include "kuserldap.h" #include "kuserldap.h"

@ -4,7 +4,7 @@ METASOURCES = AUTO
bin_PROGRAMS = secpolicy bin_PROGRAMS = secpolicy
secpolicy_SOURCES = main.cpp secpolicywin.cpp pamview.cpp ppitem.cpp secpolicy_SOURCES = main.cpp secpolicywin.cpp pamview.cpp ppitem.cpp
secpolicy_LDADD = $(LIB_KIO) 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 noinst_HEADERS = secpolicywin.h pamview.h ppitem.h

Loading…
Cancel
Save