diff options
Diffstat (limited to 'libkdenetwork')
| -rw-r--r-- | libkdenetwork/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libkdenetwork/gpgmepp/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libkdenetwork/gpgmepp/Makefile.am | 2 | ||||
| -rw-r--r-- | libkdenetwork/gpgmepp/configure.in.bot | 2 | ||||
| -rw-r--r-- | libkdenetwork/gpgmepp/configure.in.in | 4 | ||||
| -rw-r--r-- | libkdenetwork/qgpgme/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libkdenetwork/qgpgme/Makefile.am | 2 | ||||
| -rw-r--r-- | libkdenetwork/qgpgme/tests/Makefile.am | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/libkdenetwork/CMakeLists.txt b/libkdenetwork/CMakeLists.txt index 5c0290f15..1eaefeaa5 100644 --- a/libkdenetwork/CMakeLists.txt +++ b/libkdenetwork/CMakeLists.txt @@ -9,7 +9,7 @@ # ################################################# -project( libkdenetwork ) +project( libtdenetwork ) add_subdirectory( gpgmepp ) add_subdirectory( qgpgme ) diff --git a/libkdenetwork/gpgmepp/CMakeLists.txt b/libkdenetwork/gpgmepp/CMakeLists.txt index 02b50d7a7..cf4efc7f7 100644 --- a/libkdenetwork/gpgmepp/CMakeLists.txt +++ b/libkdenetwork/gpgmepp/CMakeLists.txt @@ -15,7 +15,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/libkdenetwork + ${CMAKE_SOURCE_DIR}/libtdenetwork ${CMAKE_SOURCE_DIR}/libtdepim ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} diff --git a/libkdenetwork/gpgmepp/Makefile.am b/libkdenetwork/gpgmepp/Makefile.am index 01d72de3f..d4ebfde99 100644 --- a/libkdenetwork/gpgmepp/Makefile.am +++ b/libkdenetwork/gpgmepp/Makefile.am @@ -3,7 +3,7 @@ KDE_OPTIONS = foreign SUBDIRS = interfaces . -INCLUDES = -I$(top_srcdir)/libkdenetwork -I$(top_srcdir)/libkdenetwork/gpgmepp \ +INCLUDES = -I$(top_srcdir)/libtdenetwork -I$(top_srcdir)/libtdenetwork/gpgmepp \ $(GPGME_CFLAGS) $(all_includes) gpgmeppdir = $(includedir)/gpgme++ diff --git a/libkdenetwork/gpgmepp/configure.in.bot b/libkdenetwork/gpgmepp/configure.in.bot index 100cc65c7..e4b1a8842 100644 --- a/libkdenetwork/gpgmepp/configure.in.bot +++ b/libkdenetwork/gpgmepp/configure.in.bot @@ -1,7 +1,7 @@ if test -z "$GPGME_LIBS" || test -n "$tdepim_needs_gpgme_copy" ; then echo echo "You are missing gpgme 0.4.5 or higher." - echo "Gpgme will be built statically from libkdenetwork/libgpgme-copy." + echo "Gpgme will be built statically from libtdenetwork/libgpgme-copy." echo "If you are a packager, we most strongly recommend to build against" echo "the system's shared gpgme." echo "Consider downloading gpgme >= 0.4.5 from ftp://ftp.gnupg.org/gcrypt/alpha/gpgme" diff --git a/libkdenetwork/gpgmepp/configure.in.in b/libkdenetwork/gpgmepp/configure.in.in index 74ebc4d36..6361be451 100644 --- a/libkdenetwork/gpgmepp/configure.in.in +++ b/libkdenetwork/gpgmepp/configure.in.in @@ -171,8 +171,8 @@ TDEPIM_PATH_GPGME(0.4.5,[ ],[ tdepim_needs_gpgme_copy="true" - GPGME_CFLAGS='-I$(top_srcdir)/libkdenetwork/libgpgme-copy/gpgme -I$(top_srcdir)/libkdenetwork/libgpg-error-copy -I$(top_builddir)/libkdenetwork/libgpg-error-copy' - GPGME_LIBS='$(top_builddir)/libkdenetwork/libgpgme-copy/gpgme/libgpgme.la' + GPGME_CFLAGS='-I$(top_srcdir)/libtdenetwork/libgpgme-copy/gpgme -I$(top_srcdir)/libtdenetwork/libgpg-error-copy -I$(top_builddir)/libtdenetwork/libgpg-error-copy' + GPGME_LIBS='$(top_builddir)/libtdenetwork/libgpgme-copy/gpgme/libgpgme.la' GPGME_LIBS_DEP='$(GPGME_LIBS)' # All of this is in gpgme-copy AC_DEFINE(HAVE_GPGME_KEYLIST_MODE_VALIDATE, 1, [Define to 1 if your gpgme supports GPGME_KEYLIST_MODE_VALIDATE]) diff --git a/libkdenetwork/qgpgme/CMakeLists.txt b/libkdenetwork/qgpgme/CMakeLists.txt index d7a55a5a1..1de99beb5 100644 --- a/libkdenetwork/qgpgme/CMakeLists.txt +++ b/libkdenetwork/qgpgme/CMakeLists.txt @@ -12,7 +12,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/libkdenetwork + ${CMAKE_SOURCE_DIR}/libtdenetwork ${CMAKE_SOURCE_DIR}/libtdepim ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} diff --git a/libkdenetwork/qgpgme/Makefile.am b/libkdenetwork/qgpgme/Makefile.am index 87ff793f4..108760a05 100644 --- a/libkdenetwork/qgpgme/Makefile.am +++ b/libkdenetwork/qgpgme/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = . tests -INCLUDES = -I$(top_srcdir)/libkdenetwork $(all_includes) +INCLUDES = -I$(top_srcdir)/libtdenetwork $(all_includes) lib_LTLIBRARIES = libqgpgme.la diff --git a/libkdenetwork/qgpgme/tests/Makefile.am b/libkdenetwork/qgpgme/tests/Makefile.am index 1f3100e65..5c2436d04 100644 --- a/libkdenetwork/qgpgme/tests/Makefile.am +++ b/libkdenetwork/qgpgme/tests/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_srcdir)/libkdenetwork $(GPGME_CFLAGS) $(all_includes) +INCLUDES = -I$(top_srcdir)/libtdenetwork $(GPGME_CFLAGS) $(all_includes) check_PROGRAMS = dataprovidertest |