95 files changed, 30 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 24493ba5..cd48b92b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-03  Marcus Brinkmann  <[email protected]>
+
+	* configure.ac: Replace gpgme paths with src.
+	* gpgme: Move to ...
+	* src: ... this new directory.
+
 2008-10-20  Werner Koch  <[email protected]>
 
 	* configure.ac (AC_CONFIG_FILES): Add gpgme.h.
diff --git a/Makefile.am b/Makefile.am
index c614f447..432bfca4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 # Makefile.am - Top level Makefile for GPGME.
 # Copyright (C) 2000 Werner Koch (dd9jn)
-# Copyright (C) 2001, 2002, 2004, 2005 g10 Code GmbH
+# Copyright (C) 2001, 2002, 2004, 2005, 2008 g10 Code GmbH
 # 
 # This file is part of GPGME.
 # 
@@ -43,7 +43,7 @@ else
 tests = 
 endif
 
-SUBDIRS = ${assuan} gpgme ${tests} doc ${complus} lang
+SUBDIRS = ${assuan} src ${tests} doc ${complus} lang
 
 # Fix the version of the spec file and create a file named VERSION 
 # to be used for patch's Prereq: feature.
diff --git a/assuan/ChangeLog b/assuan/ChangeLog
index cf15674e..cc39213c 100644
--- a/assuan/ChangeLog
+++ b/assuan/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-03  Marcus Brinkmann  <[email protected]>
+
+	* Makefile.am (INCLUDES): Replace gpgme path with src.
+
 2008-10-30  Marcus Brinkmann  <[email protected]>
 
 	* assuan-pipe-connect.c: Fix prototype for _gpgme_io_spawn.  Cast
diff --git a/assuan/Makefile.am b/assuan/Makefile.am
index 4607bc7c..9e0625a3 100644
--- a/assuan/Makefile.am
+++ b/assuan/Makefile.am
@@ -20,7 +20,7 @@
 ## Process this file with automake to produce Makefile.in
 
 EXTRA_DIST = mkerrors
-INCLUDES = -I.. -I$(top_srcdir)/gpgme
+INCLUDES = -I.. -I$(top_srcdir)/src
 BUILT_SOURCES = assuan-errors.c
 MOSTLYCLEANFILES = assuan-errors.c
 
diff --git a/configure.ac b/configure.ac
index 34c7508b..e4b175b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,7 +62,7 @@ BUILD_REVISION=svn_revision
 PACKAGE=$PACKAGE_NAME
 VERSION=$PACKAGE_VERSION
 
-AC_CONFIG_SRCDIR(gpgme/gpgme.h.in)
+AC_CONFIG_SRCDIR(src/gpgme.h.in)
 dnl FIXME: Enable this with autoconf 2.59.
 dnl AC_CONFIG_MACRO_DIR(m4)
 AM_CONFIG_HEADER(config.h)
@@ -743,12 +743,12 @@ AC_SUBST(LTLIBOBJS)
 #
 # Create config files 
 
-AC_CONFIG_FILES(Makefile assuan/Makefile gpgme/Makefile
+AC_CONFIG_FILES(Makefile assuan/Makefile src/Makefile
 		tests/Makefile tests/gpg/Makefile tests/gpgsm/Makefile
 		doc/Makefile complus/Makefile
-                gpgme/versioninfo.rc
-                gpgme/gpgme.h)
-AC_CONFIG_FILES(gpgme/gpgme-config, chmod +x gpgme/gpgme-config)
+                src/versioninfo.rc
+                src/gpgme.h)
+AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config)
 AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpgme.asd])
 AC_OUTPUT
 
diff --git a/gpgme/ChangeLog b/src/ChangeLog
index 9a8a7495..9a8a7495 100644
--- a/gpgme/ChangeLog
+++ b/src/ChangeLog
diff --git a/gpgme/Makefile.am b/src/Makefile.am
index a3a1066c..a3a1066c 100644
--- a/gpgme/Makefile.am
+++ b/src/Makefile.am
diff --git a/gpgme/ath-pth.c b/src/ath-pth.c
index 4c883a34..4c883a34 100644
--- a/gpgme/ath-pth.c
+++ b/src/ath-pth.c
diff --git a/gpgme/ath-pthread.c b/src/ath-pthread.c
index b201f089..b201f089 100644
--- a/gpgme/ath-pthread.c
+++ b/src/ath-pthread.c
diff --git a/gpgme/ath.c b/src/ath.c
index dda7c318..dda7c318 100644
--- a/gpgme/ath.c
+++ b/src/ath.c
diff --git a/gpgme/ath.h b/src/ath.h
index 7491f72e..7491f72e 100644
--- a/gpgme/ath.h
+++ b/src/ath.h
diff --git a/gpgme/context.h b/src/context.h
index ed5d8502..ed5d8502 100644
--- a/gpgme/context.h
+++ b/src/context.h
diff --git a/gpgme/conversion.c b/src/conversion.c
index f431238c..f431238c 100644
--- a/gpgme/conversion.c
+++ b/src/conversion.c
diff --git a/gpgme/data-compat.c b/src/data-compat.c
index cabe24e2..cabe24e2 100644
--- a/gpgme/data-compat.c
+++ b/src/data-compat.c
diff --git a/gpgme/data-fd.c b/src/data-fd.c
index 2c65be19..2c65be19 100644
--- a/gpgme/data-fd.c
+++ b/src/data-fd.c
diff --git a/gpgme/data-mem.c b/src/data-mem.c
index b58a3c04..b58a3c04 100644
--- a/gpgme/data-mem.c
+++ b/src/data-mem.c
diff --git a/gpgme/data-stream.c b/src/data-stream.c
index 629fb363..629fb363 100644
--- a/gpgme/data-stream.c
+++ b/src/data-stream.c
diff --git a/gpgme/data-user.c b/src/data-user.c
index ca9e9b12..ca9e9b12 100644
--- a/gpgme/data-user.c
+++ b/src/data-user.c
diff --git a/gpgme/data.c b/src/data.c
index 18d9c71b..18d9c71b 100644
--- a/gpgme/data.c
+++ b/src/data.c
diff --git a/gpgme/data.h b/src/data.h
index 370751d5..370751d5 100644
--- a/gpgme/data.h
+++ b/src/data.h
diff --git a/gpgme/debug.c b/src/debug.c
index bf1ca18c..bf1ca18c 100644
--- a/gpgme/debug.c
+++ b/src/debug.c
diff --git a/gpgme/debug.h b/src/debug.h
index 1083c668..1083c668 100644
--- a/gpgme/debug.h
+++ b/src/debug.h
diff --git a/gpgme/decrypt-verify.c b/src/decrypt-verify.c
index 2fa3bb24..2fa3bb24 100644
--- a/gpgme/decrypt-verify.c
+++ b/src/decrypt-verify.c
diff --git a/gpgme/decrypt.c b/src/decrypt.c
index 66250b12..66250b12 100644
--- a/gpgme/decrypt.c
+++ b/src/decrypt.c
diff --git a/gpgme/delete.c b/src/delete.c
index 38f2fddb..38f2fddb 100644
--- a/gpgme/delete.c
+++ b/src/delete.c
diff --git a/gpgme/edit.c b/src/edit.c
index 186d4f9d..186d4f9d 100644
--- a/gpgme/edit.c
+++ b/src/edit.c
diff --git a/gpgme/encrypt-sign.c b/src/encrypt-sign.c
index 7e3d2ed6..7e3d2ed6 100644
--- a/gpgme/encrypt-sign.c
+++ b/src/encrypt-sign.c
diff --git a/gpgme/encrypt.c b/src/encrypt.c
index 4744090d..4744090d 100644
--- a/gpgme/encrypt.c
+++ b/src/encrypt.c
diff --git a/gpgme/engine-backend.h b/src/engine-backend.h
index 2e2ef5ec..2e2ef5ec 100644
--- a/gpgme/engine-backend.h
+++ b/src/engine-backend.h
diff --git a/gpgme/engine-gpgconf.c b/src/engine-gpgconf.c
index 3d107d45..3d107d45 100644
--- a/gpgme/engine-gpgconf.c
+++ b/src/engine-gpgconf.c
diff --git a/gpgme/engine-gpgsm.c b/src/engine-gpgsm.c
index 936ac2e2..936ac2e2 100644
--- a/gpgme/engine-gpgsm.c
+++ b/src/engine-gpgsm.c
diff --git a/gpgme/engine.c b/src/engine.c
index cf3fe9fe..cf3fe9fe 100644
--- a/gpgme/engine.c
+++ b/src/engine.c
diff --git a/gpgme/engine.h b/src/engine.h
index e67399ec..e67399ec 100644
--- a/gpgme/engine.h
+++ b/src/engine.h
diff --git a/gpgme/error.c b/src/error.c
index 6f37ef7d..6f37ef7d 100644
--- a/gpgme/error.c
+++ b/src/error.c
diff --git a/gpgme/export.c b/src/export.c
index 079a7e0e..079a7e0e 100644
--- a/gpgme/export.c
+++ b/src/export.c
diff --git a/gpgme/funopen.c b/src/funopen.c
index a20dd8a1..a20dd8a1 100644
--- a/gpgme/funopen.c
+++ b/src/funopen.c
diff --git a/gpgme/genkey.c b/src/genkey.c
index afebb7cb..afebb7cb 100644
--- a/gpgme/genkey.c
+++ b/src/genkey.c
diff --git a/gpgme/get-env.c b/src/get-env.c
index bea8949c..bea8949c 100644
--- a/gpgme/get-env.c
+++ b/src/get-env.c
diff --git a/gpgme/getauditlog.c b/src/getauditlog.c
index 9f02b093..9f02b093 100644
--- a/gpgme/getauditlog.c
+++ b/src/getauditlog.c
diff --git a/gpgme/gpgconf.c b/src/gpgconf.c
index 9fa2ce9e..9fa2ce9e 100644
--- a/gpgme/gpgconf.c
+++ b/src/gpgconf.c
diff --git a/gpgme/gpgme-config.in b/src/gpgme-config.in
index 4a67b3f9..4a67b3f9 100644
--- a/gpgme/gpgme-config.in
+++ b/src/gpgme-config.in
diff --git a/gpgme/gpgme-w32spawn.c b/src/gpgme-w32spawn.c
index f132a8fc..f132a8fc 100644
--- a/gpgme/gpgme-w32spawn.c
+++ b/src/gpgme-w32spawn.c
diff --git a/gpgme/gpgme.c b/src/gpgme.c
index 7fbe5c38..7fbe5c38 100644
--- a/gpgme/gpgme.c
+++ b/src/gpgme.c
diff --git a/gpgme/gpgme.def b/src/gpgme.def
index c54549eb..c54549eb 100644
--- a/gpgme/gpgme.def
+++ b/src/gpgme.def
diff --git a/gpgme/gpgme.h.in b/src/gpgme.h.in
index 9dc230cb..9dc230cb 100644
--- a/gpgme/gpgme.h.in
+++ b/src/gpgme.h.in
diff --git a/gpgme/gpgme.m4 b/src/gpgme.m4
index 44bf43cb..44bf43cb 100644
--- a/gpgme/gpgme.m4
+++ b/src/gpgme.m4
diff --git a/gpgme/import.c b/src/import.c
index ad6b776b..ad6b776b 100644
--- a/gpgme/import.c
+++ b/src/import.c
diff --git a/gpgme/isascii.c b/src/isascii.c
index 924ced0c..924ced0c 100644
--- a/gpgme/isascii.c
+++ b/src/isascii.c
diff --git a/gpgme/kdpipeiodevice.cpp b/src/kdpipeiodevice.cpp
index 5661790a..5661790a 100644
--- a/gpgme/kdpipeiodevice.cpp
+++ b/src/kdpipeiodevice.cpp
diff --git a/gpgme/kdpipeiodevice.h b/src/kdpipeiodevice.h
index 8da6af68..8da6af68 100644
--- a/gpgme/kdpipeiodevice.h
+++ b/src/kdpipeiodevice.h
diff --git a/gpgme/kdpipeiodevice.moc b/src/kdpipeiodevice.moc
index 457f371a..457f371a 100644
--- a/gpgme/kdpipeiodevice.moc
+++ b/src/kdpipeiodevice.moc
diff --git a/gpgme/key.c b/src/key.c
index c9f48f87..c9f48f87 100644
--- a/gpgme/key.c
+++ b/src/key.c
diff --git a/gpgme/keylist.c b/src/keylist.c
index 69b0dc9e..69b0dc9e 100644
--- a/gpgme/keylist.c
+++ b/src/keylist.c
diff --git a/gpgme/libgpgme.vers b/src/libgpgme.vers
index f0de90ef..f0de90ef 100644
--- a/gpgme/libgpgme.vers
+++ b/src/libgpgme.vers
diff --git a/gpgme/memrchr.c b/src/memrchr.c
index 21662b1b..21662b1b 100644
--- a/gpgme/memrchr.c
+++ b/src/memrchr.c
diff --git a/gpgme/mkstatus b/src/mkstatus
index e64ab194..e64ab194 100755
--- a/gpgme/mkstatus
+++ b/src/mkstatus
diff --git a/gpgme/moc_kdpipeiodevice.cpp b/src/moc_kdpipeiodevice.cpp
index eac7b23a..eac7b23a 100644
--- a/gpgme/moc_kdpipeiodevice.cpp
+++ b/src/moc_kdpipeiodevice.cpp
diff --git a/gpgme/op-support.c b/src/op-support.c
index fefccc67..fefccc67 100644
--- a/gpgme/op-support.c
+++ b/src/op-support.c
diff --git a/gpgme/ops.h b/src/ops.h
index cd3ee4ac..cd3ee4ac 100644
--- a/gpgme/ops.h
+++ b/src/ops.h
diff --git a/gpgme/passphrase.c b/src/passphrase.c
index 71326845..71326845 100644
--- a/gpgme/passphrase.c
+++ b/src/passphrase.c
diff --git a/gpgme/posix-io.c b/src/posix-io.c
index a7047bd2..a7047bd2 100644
--- a/gpgme/posix-io.c
+++ b/src/posix-io.c
diff --git a/gpgme/posix-sema.c b/src/posix-sema.c
index 4ec3abb0..4ec3abb0 100644
--- a/gpgme/posix-sema.c
+++ b/src/posix-sema.c
diff --git a/gpgme/posix-util.c b/src/posix-util.c
index 9e669491..9e669491 100644
--- a/gpgme/posix-util.c
+++ b/src/posix-util.c
diff --git a/gpgme/priv-io.h b/src/priv-io.h
index 4a87f650..4a87f650 100644
--- a/gpgme/priv-io.h
+++ b/src/priv-io.h
diff --git a/gpgme/progress.c b/src/progress.c
index 4fe6b635..4fe6b635 100644
--- a/gpgme/progress.c
+++ b/src/progress.c
diff --git a/gpgme/putc_unlocked.c b/src/putc_unlocked.c
index a15aade8..a15aade8 100644
--- a/gpgme/putc_unlocked.c
+++ b/src/putc_unlocked.c
diff --git a/gpgme/rungpg.c b/src/rungpg.c
index fc0da117..fc0da117 100644
--- a/gpgme/rungpg.c
+++ b/src/rungpg.c
diff --git a/gpgme/sema.h b/src/sema.h
index 7d3870e9..7d3870e9 100644
--- a/gpgme/sema.h
+++ b/src/sema.h
diff --git a/gpgme/setenv.c b/src/setenv.c
index d3a54c14..d3a54c14 100644
--- a/gpgme/setenv.c
+++ b/src/setenv.c
diff --git a/gpgme/sig-notation.c b/src/sig-notation.c
index 5800c378..5800c378 100644
--- a/gpgme/sig-notation.c
+++ b/src/sig-notation.c
diff --git a/gpgme/sign.c b/src/sign.c
index 8405b690..8405b690 100644
--- a/gpgme/sign.c
+++ b/src/sign.c
diff --git a/gpgme/signers.c b/src/signers.c
index f1ce58f1..f1ce58f1 100644
--- a/gpgme/signers.c
+++ b/src/signers.c
diff --git a/gpgme/stpcpy.c b/src/stpcpy.c
index 6e42911f..6e42911f 100644
--- a/gpgme/stpcpy.c
+++ b/src/stpcpy.c
diff --git a/gpgme/trust-item.c b/src/trust-item.c
index 4dd0c4e5..4dd0c4e5 100644
--- a/gpgme/trust-item.c
+++ b/src/trust-item.c
diff --git a/gpgme/trustlist.c b/src/trustlist.c
index e8cdb66e..e8cdb66e 100644
--- a/gpgme/trustlist.c
+++ b/src/trustlist.c
diff --git a/gpgme/ttyname_r.c b/src/ttyname_r.c
index 44876587..44876587 100644
--- a/gpgme/ttyname_r.c
+++ b/src/ttyname_r.c
diff --git a/gpgme/util.h b/src/util.h
index 0d6a2543..0d6a2543 100644
--- a/gpgme/util.h
+++ b/src/util.h
diff --git a/gpgme/vasprintf.c b/src/vasprintf.c
index 77113a31..77113a31 100644
--- a/gpgme/vasprintf.c
+++ b/src/vasprintf.c
diff --git a/gpgme/verify.c b/src/verify.c
index ef1ccd6c..ef1ccd6c 100644
--- a/gpgme/verify.c
+++ b/src/verify.c
diff --git a/gpgme/version.c b/src/version.c
index dd23ccfc..dd23ccfc 100644
--- a/gpgme/version.c
+++ b/src/version.c
diff --git a/gpgme/versioninfo.rc.in b/src/versioninfo.rc.in
index bfb652e1..bfb652e1 100644
--- a/gpgme/versioninfo.rc.in
+++ b/src/versioninfo.rc.in
diff --git a/gpgme/w32-glib-io.c b/src/w32-glib-io.c
index f4afc7e1..f4afc7e1 100644
--- a/gpgme/w32-glib-io.c
+++ b/src/w32-glib-io.c
diff --git a/gpgme/w32-io.c b/src/w32-io.c
index 1f62a6f1..1f62a6f1 100644
--- a/gpgme/w32-io.c
+++ b/src/w32-io.c
diff --git a/gpgme/w32-qt-io.cpp b/src/w32-qt-io.cpp
index 43f94fd1..43f94fd1 100644
--- a/gpgme/w32-qt-io.cpp
+++ b/src/w32-qt-io.cpp
diff --git a/gpgme/w32-sema.c b/src/w32-sema.c
index 5228cc7c..5228cc7c 100644
--- a/gpgme/w32-sema.c
+++ b/src/w32-sema.c
diff --git a/gpgme/w32-util.c b/src/w32-util.c
index a4a01f40..a4a01f40 100644
--- a/gpgme/w32-util.c
+++ b/src/w32-util.c
diff --git a/gpgme/wait-global.c b/src/wait-global.c
index ececc1bc..ececc1bc 100644
--- a/gpgme/wait-global.c
+++ b/src/wait-global.c
diff --git a/gpgme/wait-private.c b/src/wait-private.c
index 2dee1a93..2dee1a93 100644
--- a/gpgme/wait-private.c
+++ b/src/wait-private.c
diff --git a/gpgme/wait-user.c b/src/wait-user.c
index 995657fa..995657fa 100644
--- a/gpgme/wait-user.c
+++ b/src/wait-user.c
diff --git a/gpgme/wait.c b/src/wait.c
index f5bc2d96..f5bc2d96 100644
--- a/gpgme/wait.c
+++ b/src/wait.c
diff --git a/gpgme/wait.h b/src/wait.h
index eafbb6f6..eafbb6f6 100644
--- a/gpgme/wait.h
+++ b/src/wait.h
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 060c12ff..088d5ba3 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-03  Marcus Brinkmann  <[email protected]>
+
+	* gpgsm/Makefile.am (INCLUDES, LDADD): Replace gpgme path with src.
+	* gpg/Makefile.am (INCLUDES, LDADD, t_thread1_LDADD): Likewise.
+	* Makefile.am (LDADD): Likewise.
+
 2008-06-19  Werner Koch  <[email protected]>
 
 	* gpg/t-gpgconf.c (dump_arg): Add new types.  Print strings in
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ceabc999..068f8865 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -29,7 +29,7 @@ EXTRA_DIST = t-data-1.txt t-data-2.txt
 INCLUDES = -I$(top_srcdir)/gpgme
 
 AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
-LDADD = ../gpgme/libgpgme.la @GPG_ERROR_LIBS@
+LDADD = ../src/libgpgme.la @GPG_ERROR_LIBS@
 
 noinst_PROGRAMS = $(TESTS)
 
diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
index a0c3520c..f295fe6e 100644
--- a/tests/gpg/Makefile.am
+++ b/tests/gpg/Makefile.am
@@ -43,11 +43,11 @@ DISTCLEANFILES = pubring.gpg~ pubring.kbx~ random_seed gpg.conf gpg-agent.conf
 EXTRA_DIST = mkdemodirs pubdemo.asc secdemo.asc cipher-1.asc cipher-2.asc \
 	geheim.txt pubkey-1.asc seckey-1.asc pinentry
 
-INCLUDES = -I$(top_srcdir)/gpgme
+INCLUDES = -I$(top_srcdir)/src
 
 AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
-LDADD = ../../gpgme/libgpgme.la
-t_thread1_LDADD = ../../gpgme/libgpgme-pthread.la
+LDADD = ../../src/libgpgme.la
+t_thread1_LDADD = ../../src/libgpgme-pthread.la
 
 # We don't run t-genkey in the test suite, because it takes too long
 noinst_PROGRAMS = $(TESTS) t-genkey
diff --git a/tests/gpgsm/Makefile.am b/tests/gpgsm/Makefile.am
index 74b9fbad..91a8cf73 100644
--- a/tests/gpgsm/Makefile.am
+++ b/tests/gpgsm/Makefile.am
@@ -29,10 +29,10 @@ TESTS = t-import t-keylist t-encrypt t-verify t-decrypt t-sign t-export
 EXTRA_DIST = cert_dfn_pca01.der cert_dfn_pca15.der cert_g10code_test1.der \
 	$(key_id)
 
-INCLUDES = -I$(top_srcdir)/gpgme
+INCLUDES = -I$(top_srcdir)/src
 
 AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
-LDADD = ../../gpgme/libgpgme.la
+LDADD = ../../src/libgpgme.la
 
 # We don't run t-genkey in the test suite, because it takes too long
 # and needs a working pinentry.