diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:18:06 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:18:06 -0600 |
| commit | 79fd2b2bbd9f842ce3c84c67e3314033a9cceea4 (patch) | |
| tree | d6d2174614dc2384de6f77a930aaf3d06b276fae /kgpg | |
| parent | c3e3301aba81e1c1771fa309941888a8b0fb59bc (diff) | |
| download | tdeutils-79fd2b2bbd9f842ce3c84c67e3314033a9cceea4.tar.gz tdeutils-79fd2b2bbd9f842ce3c84c67e3314033a9cceea4.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kgpg')
| -rw-r--r-- | kgpg/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kgpg/Makefile.am | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kgpg/CMakeLists.txt b/kgpg/CMakeLists.txt index 4d976df..3bd5905 100644 --- a/kgpg/CMakeLists.txt +++ b/kgpg/CMakeLists.txt @@ -40,7 +40,7 @@ tde_add_executable( kgpg AUTOMOC keyexport.ui sourceselect.ui kgpgsettings.kcfgc conf_servers.ui conf_ui2.ui conf_misc.ui - LINK kabc-shared kutils-shared tdeprint-shared + LINK kabc-shared tdeutils-shared tdeprint-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kgpg/Makefile.am b/kgpg/Makefile.am index 5af8eab..7cb6316 100644 --- a/kgpg/Makefile.am +++ b/kgpg/Makefile.am @@ -11,7 +11,7 @@ kgpg_SOURCES = kgpgoptions.cpp listkeys.cpp popuppublic.cpp kgpgview.cpp \ keyproperties.ui conf_encryption.ui conf_decryption.ui conf_gpg.ui dcopiface.skel \ keyinfowidget.cpp groupedit.ui kgpgrevokewidget.ui newkey.ui adduid.ui keyexport.ui \ sourceselect.ui kgpgsettings.kcfgc conf_servers.ui conf_ui2.ui conf_misc.ui -kgpg_LDADD = $(LIB_KIO) $(LIB_KABC) -lkutils -ltdeprint +kgpg_LDADD = $(LIB_KIO) $(LIB_KABC) -ltdeutils -ltdeprint pics_DATA= kgpg_anim.gif kgpg_docked.png kgpg_docked.gif kgpg_blank.png kgpg_fill.png picsdir=$(kde_datadir)/kgpg/pics @@ -28,7 +28,7 @@ kde_kcfg_DATA = kgpg.kcfg METASOURCES = AUTO # the library search path. -kgpg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kgpg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor appsdir = $(kde_datadir)/kgpg apps_DATA = kgpg.rc listkeys.rc tips |