008-11-03 Marcus Brinkmann <marcus@g10code.com>

        * configure.ac: Replace gpgme paths with src.
        * gpgme: Move to ...
        * src: ... this new directory.

assuan/
2008-11-03  Marcus Brinkmann  <marcus@g10code.com>

	* Makefile.am (INCLUDES): Replace gpgme path with src.

tests/
2008-11-03  Marcus Brinkmann  <marcus@g10code.com>

        * gpgsm/Makefile.am (INCLUDES, LDADD): Replace gpgme path with src.
        * gpg/Makefile.am (INCLUDES, LDADD, t_thread1_LDADD): Likewise.
	* Makefile.am (LDADD): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 24493ba5a2a82ebec3c5fa9568256b7876bc7a1a..cd48b92b227a84ee8c52f2061b48ceab8e07095f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-03  Marcus Brinkmann  <marcus@g10code.com>
+
+       * configure.ac: Replace gpgme paths with src.
+       * gpgme: Move to ...
+       * src: ... this new directory.
+
 2008-10-20  Werner Koch  <wk@g10code.com>
 
        * configure.ac (AC_CONFIG_FILES): Add gpgme.h.

diff --git a/Makefile.am b/Makefile.am
index c614f447700f71f1e58642e38eb828caf1879775..432bfca406fec6723eca1103762ead8fe844b2a3 100644 (file)
--- 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 cf15674e8a805f28544edc50d43a9e4582c3dee6..cc39213ce01d6f56cafcc57c28f5130461c78e7d 100644 (file)
--- a/assuan/ChangeLog
+++ b/assuan/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-03  Marcus Brinkmann  <marcus@g10code.com>
+
+       * Makefile.am (INCLUDES): Replace gpgme path with src.
+
 2008-10-30  Marcus Brinkmann  <marcus@g10code.de>
 
        * assuan-pipe-connect.c: Fix prototype for _gpgme_io_spawn.  Cast

diff --git a/assuan/Makefile.am b/assuan/Makefile.am
index 4607bc7c7d1ad5e9b027a8a7ec72ee980745c7db..9e0625a3fdf13f9f205596874afa19245f11908a 100644 (file)
--- 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 34c7508b20b438d51257c86a3518ead05e494e60..e4b175b102e59119435bcc34d4600fa837ddc351 100644 (file)
--- 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
similarity index 100%
rename from gpgme/ChangeLog
rename to src/ChangeLog

diff --git a/gpgme/Makefile.am b/src/Makefile.am
similarity index 100%
rename from gpgme/Makefile.am
rename to src/Makefile.am

diff --git a/gpgme/ath-pth.c b/src/ath-pth.c
similarity index 100%
rename from gpgme/ath-pth.c
rename to src/ath-pth.c

diff --git a/gpgme/ath-pthread.c b/src/ath-pthread.c
similarity index 100%
rename from gpgme/ath-pthread.c
rename to src/ath-pthread.c

diff --git a/gpgme/ath.c b/src/ath.c
similarity index 100%
rename from gpgme/ath.c
rename to src/ath.c

diff --git a/gpgme/ath.h b/src/ath.h
similarity index 100%
rename from gpgme/ath.h
rename to src/ath.h

diff --git a/gpgme/context.h b/src/context.h
similarity index 100%
rename from gpgme/context.h
rename to src/context.h

diff --git a/gpgme/conversion.c b/src/conversion.c
similarity index 100%
rename from gpgme/conversion.c
rename to src/conversion.c

diff --git a/gpgme/data-compat.c b/src/data-compat.c
similarity index 100%
rename from gpgme/data-compat.c
rename to src/data-compat.c

diff --git a/gpgme/data-fd.c b/src/data-fd.c
similarity index 100%
rename from gpgme/data-fd.c
rename to src/data-fd.c

diff --git a/gpgme/data-mem.c b/src/data-mem.c
similarity index 100%
rename from gpgme/data-mem.c
rename to src/data-mem.c

diff --git a/gpgme/data-stream.c b/src/data-stream.c
similarity index 100%
rename from gpgme/data-stream.c
rename to src/data-stream.c

diff --git a/gpgme/data-user.c b/src/data-user.c
similarity index 100%
rename from gpgme/data-user.c
rename to src/data-user.c

diff --git a/gpgme/data.c b/src/data.c
similarity index 100%
rename from gpgme/data.c
rename to src/data.c

diff --git a/gpgme/data.h b/src/data.h
similarity index 100%
rename from gpgme/data.h
rename to src/data.h

diff --git a/gpgme/debug.c b/src/debug.c
similarity index 100%
rename from gpgme/debug.c
rename to src/debug.c

diff --git a/gpgme/debug.h b/src/debug.h
similarity index 100%
rename from gpgme/debug.h
rename to src/debug.h

diff --git a/gpgme/decrypt-verify.c b/src/decrypt-verify.c
similarity index 100%
rename from gpgme/decrypt-verify.c
rename to src/decrypt-verify.c

diff --git a/gpgme/decrypt.c b/src/decrypt.c
similarity index 100%
rename from gpgme/decrypt.c
rename to src/decrypt.c

diff --git a/gpgme/delete.c b/src/delete.c
similarity index 100%
rename from gpgme/delete.c
rename to src/delete.c

diff --git a/gpgme/edit.c b/src/edit.c
similarity index 100%
rename from gpgme/edit.c
rename to src/edit.c

diff --git a/gpgme/encrypt-sign.c b/src/encrypt-sign.c
similarity index 100%
rename from gpgme/encrypt-sign.c
rename to src/encrypt-sign.c

diff --git a/gpgme/encrypt.c b/src/encrypt.c
similarity index 100%
rename from gpgme/encrypt.c
rename to src/encrypt.c

diff --git a/gpgme/engine-backend.h b/src/engine-backend.h
similarity index 100%
rename from gpgme/engine-backend.h
rename to src/engine-backend.h

diff --git a/gpgme/engine-gpgconf.c b/src/engine-gpgconf.c
similarity index 100%
rename from gpgme/engine-gpgconf.c
rename to src/engine-gpgconf.c

diff --git a/gpgme/engine-gpgsm.c b/src/engine-gpgsm.c
similarity index 100%
rename from gpgme/engine-gpgsm.c
rename to src/engine-gpgsm.c

diff --git a/gpgme/engine.c b/src/engine.c
similarity index 100%
rename from gpgme/engine.c
rename to src/engine.c

diff --git a/gpgme/engine.h b/src/engine.h
similarity index 100%
rename from gpgme/engine.h
rename to src/engine.h

diff --git a/gpgme/error.c b/src/error.c
similarity index 100%
rename from gpgme/error.c
rename to src/error.c

diff --git a/gpgme/export.c b/src/export.c
similarity index 100%
rename from gpgme/export.c
rename to src/export.c

diff --git a/gpgme/funopen.c b/src/funopen.c
similarity index 100%
rename from gpgme/funopen.c
rename to src/funopen.c

diff --git a/gpgme/genkey.c b/src/genkey.c
similarity index 100%
rename from gpgme/genkey.c
rename to src/genkey.c

diff --git a/gpgme/get-env.c b/src/get-env.c
similarity index 100%
rename from gpgme/get-env.c
rename to src/get-env.c

diff --git a/gpgme/getauditlog.c b/src/getauditlog.c
similarity index 100%
rename from gpgme/getauditlog.c
rename to src/getauditlog.c

diff --git a/gpgme/gpgconf.c b/src/gpgconf.c
similarity index 100%
rename from gpgme/gpgconf.c
rename to src/gpgconf.c

diff --git a/gpgme/gpgme-config.in b/src/gpgme-config.in
similarity index 100%
rename from gpgme/gpgme-config.in
rename to src/gpgme-config.in

diff --git a/gpgme/gpgme-w32spawn.c b/src/gpgme-w32spawn.c
similarity index 100%
rename from gpgme/gpgme-w32spawn.c
rename to src/gpgme-w32spawn.c

diff --git a/gpgme/gpgme.c b/src/gpgme.c
similarity index 100%
rename from gpgme/gpgme.c
rename to src/gpgme.c

diff --git a/gpgme/gpgme.def b/src/gpgme.def
similarity index 100%
rename from gpgme/gpgme.def
rename to src/gpgme.def

diff --git a/gpgme/gpgme.h.in b/src/gpgme.h.in
similarity index 100%
rename from gpgme/gpgme.h.in
rename to src/gpgme.h.in

diff --git a/gpgme/gpgme.m4 b/src/gpgme.m4
similarity index 100%
rename from gpgme/gpgme.m4
rename to src/gpgme.m4

diff --git a/gpgme/import.c b/src/import.c
similarity index 100%
rename from gpgme/import.c
rename to src/import.c

diff --git a/gpgme/isascii.c b/src/isascii.c
similarity index 100%
rename from gpgme/isascii.c
rename to src/isascii.c

diff --git a/gpgme/kdpipeiodevice.cpp b/src/kdpipeiodevice.cpp
similarity index 100%
rename from gpgme/kdpipeiodevice.cpp
rename to src/kdpipeiodevice.cpp

diff --git a/gpgme/kdpipeiodevice.h b/src/kdpipeiodevice.h
similarity index 100%
rename from gpgme/kdpipeiodevice.h
rename to src/kdpipeiodevice.h

diff --git a/gpgme/kdpipeiodevice.moc b/src/kdpipeiodevice.moc
similarity index 100%
rename from gpgme/kdpipeiodevice.moc
rename to src/kdpipeiodevice.moc

diff --git a/gpgme/key.c b/src/key.c
similarity index 100%
rename from gpgme/key.c
rename to src/key.c

diff --git a/gpgme/keylist.c b/src/keylist.c
similarity index 100%
rename from gpgme/keylist.c
rename to src/keylist.c

diff --git a/gpgme/libgpgme.vers b/src/libgpgme.vers
similarity index 100%
rename from gpgme/libgpgme.vers
rename to src/libgpgme.vers

diff --git a/gpgme/memrchr.c b/src/memrchr.c
similarity index 100%
rename from gpgme/memrchr.c
rename to src/memrchr.c

diff --git a/gpgme/mkstatus b/src/mkstatus
similarity index 100%
rename from gpgme/mkstatus
rename to src/mkstatus

diff --git a/gpgme/moc_kdpipeiodevice.cpp b/src/moc_kdpipeiodevice.cpp
similarity index 100%
rename from gpgme/moc_kdpipeiodevice.cpp
rename to src/moc_kdpipeiodevice.cpp

diff --git a/gpgme/op-support.c b/src/op-support.c
similarity index 100%
rename from gpgme/op-support.c
rename to src/op-support.c

diff --git a/gpgme/ops.h b/src/ops.h
similarity index 100%
rename from gpgme/ops.h
rename to src/ops.h

diff --git a/gpgme/passphrase.c b/src/passphrase.c
similarity index 100%
rename from gpgme/passphrase.c
rename to src/passphrase.c

diff --git a/gpgme/posix-io.c b/src/posix-io.c
similarity index 100%
rename from gpgme/posix-io.c
rename to src/posix-io.c

diff --git a/gpgme/posix-sema.c b/src/posix-sema.c
similarity index 100%
rename from gpgme/posix-sema.c
rename to src/posix-sema.c

diff --git a/gpgme/posix-util.c b/src/posix-util.c
similarity index 100%
rename from gpgme/posix-util.c
rename to src/posix-util.c

diff --git a/gpgme/priv-io.h b/src/priv-io.h
similarity index 100%
rename from gpgme/priv-io.h
rename to src/priv-io.h

diff --git a/gpgme/progress.c b/src/progress.c
similarity index 100%
rename from gpgme/progress.c
rename to src/progress.c

diff --git a/gpgme/putc_unlocked.c b/src/putc_unlocked.c
similarity index 100%
rename from gpgme/putc_unlocked.c
rename to src/putc_unlocked.c

diff --git a/gpgme/rungpg.c b/src/rungpg.c
similarity index 100%
rename from gpgme/rungpg.c
rename to src/rungpg.c

diff --git a/gpgme/sema.h b/src/sema.h
similarity index 100%
rename from gpgme/sema.h
rename to src/sema.h

diff --git a/gpgme/setenv.c b/src/setenv.c
similarity index 100%
rename from gpgme/setenv.c
rename to src/setenv.c

diff --git a/gpgme/sig-notation.c b/src/sig-notation.c
similarity index 100%
rename from gpgme/sig-notation.c
rename to src/sig-notation.c

diff --git a/gpgme/sign.c b/src/sign.c
similarity index 100%
rename from gpgme/sign.c
rename to src/sign.c

diff --git a/gpgme/signers.c b/src/signers.c
similarity index 100%
rename from gpgme/signers.c
rename to src/signers.c

diff --git a/gpgme/stpcpy.c b/src/stpcpy.c
similarity index 100%
rename from gpgme/stpcpy.c
rename to src/stpcpy.c

diff --git a/gpgme/trust-item.c b/src/trust-item.c
similarity index 100%
rename from gpgme/trust-item.c
rename to src/trust-item.c

diff --git a/gpgme/trustlist.c b/src/trustlist.c
similarity index 100%
rename from gpgme/trustlist.c
rename to src/trustlist.c

diff --git a/gpgme/ttyname_r.c b/src/ttyname_r.c
similarity index 100%
rename from gpgme/ttyname_r.c
rename to src/ttyname_r.c

diff --git a/gpgme/util.h b/src/util.h
similarity index 100%
rename from gpgme/util.h
rename to src/util.h

diff --git a/gpgme/vasprintf.c b/src/vasprintf.c
similarity index 100%
rename from gpgme/vasprintf.c
rename to src/vasprintf.c

diff --git a/gpgme/verify.c b/src/verify.c
similarity index 100%
rename from gpgme/verify.c
rename to src/verify.c

diff --git a/gpgme/version.c b/src/version.c
similarity index 100%
rename from gpgme/version.c
rename to src/version.c

diff --git a/gpgme/versioninfo.rc.in b/src/versioninfo.rc.in
similarity index 100%
rename from gpgme/versioninfo.rc.in
rename to src/versioninfo.rc.in

diff --git a/gpgme/w32-glib-io.c b/src/w32-glib-io.c
similarity index 100%
rename from gpgme/w32-glib-io.c
rename to src/w32-glib-io.c

diff --git a/gpgme/w32-io.c b/src/w32-io.c
similarity index 100%
rename from gpgme/w32-io.c
rename to src/w32-io.c

diff --git a/gpgme/w32-qt-io.cpp b/src/w32-qt-io.cpp
similarity index 100%
rename from gpgme/w32-qt-io.cpp
rename to src/w32-qt-io.cpp

diff --git a/gpgme/w32-sema.c b/src/w32-sema.c
similarity index 100%
rename from gpgme/w32-sema.c
rename to src/w32-sema.c

diff --git a/gpgme/w32-util.c b/src/w32-util.c
similarity index 100%
rename from gpgme/w32-util.c
rename to src/w32-util.c

diff --git a/gpgme/wait-global.c b/src/wait-global.c
similarity index 100%
rename from gpgme/wait-global.c
rename to src/wait-global.c

diff --git a/gpgme/wait-private.c b/src/wait-private.c
similarity index 100%
rename from gpgme/wait-private.c
rename to src/wait-private.c

diff --git a/gpgme/wait-user.c b/src/wait-user.c
similarity index 100%
rename from gpgme/wait-user.c
rename to src/wait-user.c

diff --git a/gpgme/wait.c b/src/wait.c
similarity index 100%
rename from gpgme/wait.c
rename to src/wait.c

diff --git a/gpgme/wait.h b/src/wait.h
similarity index 100%
rename from gpgme/wait.h
rename to src/wait.h

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 060c12ffd656d8dc3817afe37f109846b19e2244..088d5ba3436dbef12c8e903761f559444ce9db6b 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-03  Marcus Brinkmann  <marcus@g10code.com>
+
+       * 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  <wk@g10code.com>
 
        * gpg/t-gpgconf.c (dump_arg): Add new types.  Print strings in

diff --git a/tests/Makefile.am b/tests/Makefile.am
index ceabc999253cb8a12b11083d92bb05c3c3bb1213..068f8865cb9bcf7a7f26aed1e70deac4dcae8ad7 100644 (file)
--- 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 a0c3520c3e0d0a4595f0f2f0dc06e3cdae23cd17..f295fe6ef1c5dc1a557994193157c47c7bd68c69 100644 (file)
--- 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 74b9fbad5a1f236ec65e9cc4c396d730c5b19cc8..91a8cf733fd28cdbe624b333800ef7cca40cd609 100644 (file)
--- 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.