summaryrefslogtreecommitdiffstats
path: root/certmanager
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:17:50 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:17:50 -0600
commitb363d2579af0a11b77e698aed2e1021c2233b644 (patch)
treef4a47b87354b7a6a3b266c8121bd8ddaeb7accaa /certmanager
parent61bddfe3a7226b18c68a76124b727c736f431688 (diff)
downloadtdepim-b363d2579af0a11b77e698aed2e1021c2233b644.tar.gz
tdepim-b363d2579af0a11b77e698aed2e1021c2233b644.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'certmanager')
-rw-r--r--certmanager/CMakeLists.txt2
-rw-r--r--certmanager/Makefile.am2
-rw-r--r--certmanager/kwatchgnupg/Makefile.am2
3 files changed, 3 insertions, 3 deletions
diff --git a/certmanager/CMakeLists.txt b/certmanager/CMakeLists.txt
index d98988bc3..8ff147bba 100644
--- a/certmanager/CMakeLists.txt
+++ b/certmanager/CMakeLists.txt
@@ -50,7 +50,7 @@ tde_add_executable( kleopatra AUTOMOC
hierarchyanalyser.cpp certificatewizard.ui certificatewizardimpl.cpp
certificateinfowidget.ui certificateinfowidgetimpl.cpp
crlview.cpp storedtransferjob.cpp certlistview.cpp
- LINK conf-static kleopatra-shared kutils-shared kabc-shared
+ LINK conf-static kleopatra-shared tdeutils-shared kabc-shared
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/certmanager/Makefile.am b/certmanager/Makefile.am
index 8f7371162..0c37f3fae 100644
--- a/certmanager/Makefile.am
+++ b/certmanager/Makefile.am
@@ -17,7 +17,7 @@ kleopatra_SOURCES = \
METASOURCES = AUTO
-kleopatra_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kleopatra_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kleopatra_LDADD = conf/libconf.la lib/libkleopatra.la $(LIB_KUTILS) $(LIB_KABC)
rcdir = $(kde_datadir)/kleopatra
diff --git a/certmanager/kwatchgnupg/Makefile.am b/certmanager/kwatchgnupg/Makefile.am
index 0c25605fa..f5b28ba41 100644
--- a/certmanager/kwatchgnupg/Makefile.am
+++ b/certmanager/kwatchgnupg/Makefile.am
@@ -13,7 +13,7 @@ kwatchgnupg_SOURCES = \
METASOURCES = AUTO
-kwatchgnupg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kwatchgnupg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kwatchgnupg_LDADD = ../conf/libconf.la ../lib/libkleopatra.la $(LIB_KUTILS) $(LIB_KABC)
rcdir = $(kde_datadir)/kwatchgnupg