008-11-03 Marcus Brinkmann <marcus@g10code.com>
authorMarcus Brinkmann <mb@g10code.com>
Mon, 3 Nov 2008 17:24:09 +0000 (17:24 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Mon, 3 Nov 2008 17:24:09 +0000 (17:24 +0000)
        * 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.

95 files changed:
ChangeLog
Makefile.am
assuan/ChangeLog
assuan/Makefile.am
configure.ac
src/ChangeLog [moved from gpgme/ChangeLog with 100% similarity]
src/Makefile.am [moved from gpgme/Makefile.am with 100% similarity]
src/ath-pth.c [moved from gpgme/ath-pth.c with 100% similarity]
src/ath-pthread.c [moved from gpgme/ath-pthread.c with 100% similarity]
src/ath.c [moved from gpgme/ath.c with 100% similarity]
src/ath.h [moved from gpgme/ath.h with 100% similarity]
src/context.h [moved from gpgme/context.h with 100% similarity]
src/conversion.c [moved from gpgme/conversion.c with 100% similarity]
src/data-compat.c [moved from gpgme/data-compat.c with 100% similarity]
src/data-fd.c [moved from gpgme/data-fd.c with 100% similarity]
src/data-mem.c [moved from gpgme/data-mem.c with 100% similarity]
src/data-stream.c [moved from gpgme/data-stream.c with 100% similarity]
src/data-user.c [moved from gpgme/data-user.c with 100% similarity]
src/data.c [moved from gpgme/data.c with 100% similarity]
src/data.h [moved from gpgme/data.h with 100% similarity]
src/debug.c [moved from gpgme/debug.c with 100% similarity]
src/debug.h [moved from gpgme/debug.h with 100% similarity]
src/decrypt-verify.c [moved from gpgme/decrypt-verify.c with 100% similarity]
src/decrypt.c [moved from gpgme/decrypt.c with 100% similarity]
src/delete.c [moved from gpgme/delete.c with 100% similarity]
src/edit.c [moved from gpgme/edit.c with 100% similarity]
src/encrypt-sign.c [moved from gpgme/encrypt-sign.c with 100% similarity]
src/encrypt.c [moved from gpgme/encrypt.c with 100% similarity]
src/engine-backend.h [moved from gpgme/engine-backend.h with 100% similarity]
src/engine-gpgconf.c [moved from gpgme/engine-gpgconf.c with 100% similarity]
src/engine-gpgsm.c [moved from gpgme/engine-gpgsm.c with 100% similarity]
src/engine.c [moved from gpgme/engine.c with 100% similarity]
src/engine.h [moved from gpgme/engine.h with 100% similarity]
src/error.c [moved from gpgme/error.c with 100% similarity]
src/export.c [moved from gpgme/export.c with 100% similarity]
src/funopen.c [moved from gpgme/funopen.c with 100% similarity]
src/genkey.c [moved from gpgme/genkey.c with 100% similarity]
src/get-env.c [moved from gpgme/get-env.c with 100% similarity]
src/getauditlog.c [moved from gpgme/getauditlog.c with 100% similarity]
src/gpgconf.c [moved from gpgme/gpgconf.c with 100% similarity]
src/gpgme-config.in [moved from gpgme/gpgme-config.in with 100% similarity]
src/gpgme-w32spawn.c [moved from gpgme/gpgme-w32spawn.c with 100% similarity]
src/gpgme.c [moved from gpgme/gpgme.c with 100% similarity]
src/gpgme.def [moved from gpgme/gpgme.def with 100% similarity]
src/gpgme.h.in [moved from gpgme/gpgme.h.in with 100% similarity]
src/gpgme.m4 [moved from gpgme/gpgme.m4 with 100% similarity]
src/import.c [moved from gpgme/import.c with 100% similarity]
src/isascii.c [moved from gpgme/isascii.c with 100% similarity]
src/kdpipeiodevice.cpp [moved from gpgme/kdpipeiodevice.cpp with 100% similarity]
src/kdpipeiodevice.h [moved from gpgme/kdpipeiodevice.h with 100% similarity]
src/kdpipeiodevice.moc [moved from gpgme/kdpipeiodevice.moc with 100% similarity]
src/key.c [moved from gpgme/key.c with 100% similarity]
src/keylist.c [moved from gpgme/keylist.c with 100% similarity]
src/libgpgme.vers [moved from gpgme/libgpgme.vers with 100% similarity]
src/memrchr.c [moved from gpgme/memrchr.c with 100% similarity]
src/mkstatus [moved from gpgme/mkstatus with 100% similarity]
src/moc_kdpipeiodevice.cpp [moved from gpgme/moc_kdpipeiodevice.cpp with 100% similarity]
src/op-support.c [moved from gpgme/op-support.c with 100% similarity]
src/ops.h [moved from gpgme/ops.h with 100% similarity]
src/passphrase.c [moved from gpgme/passphrase.c with 100% similarity]
src/posix-io.c [moved from gpgme/posix-io.c with 100% similarity]
src/posix-sema.c [moved from gpgme/posix-sema.c with 100% similarity]
src/posix-util.c [moved from gpgme/posix-util.c with 100% similarity]
src/priv-io.h [moved from gpgme/priv-io.h with 100% similarity]
src/progress.c [moved from gpgme/progress.c with 100% similarity]
src/putc_unlocked.c [moved from gpgme/putc_unlocked.c with 100% similarity]
src/rungpg.c [moved from gpgme/rungpg.c with 100% similarity]
src/sema.h [moved from gpgme/sema.h with 100% similarity]
src/setenv.c [moved from gpgme/setenv.c with 100% similarity]
src/sig-notation.c [moved from gpgme/sig-notation.c with 100% similarity]
src/sign.c [moved from gpgme/sign.c with 100% similarity]
src/signers.c [moved from gpgme/signers.c with 100% similarity]
src/stpcpy.c [moved from gpgme/stpcpy.c with 100% similarity]
src/trust-item.c [moved from gpgme/trust-item.c with 100% similarity]
src/trustlist.c [moved from gpgme/trustlist.c with 100% similarity]
src/ttyname_r.c [moved from gpgme/ttyname_r.c with 100% similarity]
src/util.h [moved from gpgme/util.h with 100% similarity]
src/vasprintf.c [moved from gpgme/vasprintf.c with 100% similarity]
src/verify.c [moved from gpgme/verify.c with 100% similarity]
src/version.c [moved from gpgme/version.c with 100% similarity]
src/versioninfo.rc.in [moved from gpgme/versioninfo.rc.in with 100% similarity]
src/w32-glib-io.c [moved from gpgme/w32-glib-io.c with 100% similarity]
src/w32-io.c [moved from gpgme/w32-io.c with 100% similarity]
src/w32-qt-io.cpp [moved from gpgme/w32-qt-io.cpp with 100% similarity]
src/w32-sema.c [moved from gpgme/w32-sema.c with 100% similarity]
src/w32-util.c [moved from gpgme/w32-util.c with 100% similarity]
src/wait-global.c [moved from gpgme/wait-global.c with 100% similarity]
src/wait-private.c [moved from gpgme/wait-private.c with 100% similarity]
src/wait-user.c [moved from gpgme/wait-user.c with 100% similarity]
src/wait.c [moved from gpgme/wait.c with 100% similarity]
src/wait.h [moved from gpgme/wait.h with 100% similarity]
tests/ChangeLog
tests/Makefile.am
tests/gpg/Makefile.am
tests/gpgsm/Makefile.am

index 24493ba..cd48b92 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.
index c614f44..432bfca 100644 (file)
@@ -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.
index cf15674..cc39213 100644 (file)
@@ -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
index 4607bc7..9e0625a 100644 (file)
@@ -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
 
index 34c7508..e4b175b 100644 (file)
@@ -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
 
similarity index 100%
rename from gpgme/ChangeLog
rename to src/ChangeLog
similarity index 100%
rename from gpgme/Makefile.am
rename to src/Makefile.am
similarity index 100%
rename from gpgme/ath-pth.c
rename to src/ath-pth.c
similarity index 100%
rename from gpgme/ath-pthread.c
rename to src/ath-pthread.c
similarity index 100%
rename from gpgme/ath.c
rename to src/ath.c
similarity index 100%
rename from gpgme/ath.h
rename to src/ath.h
similarity index 100%
rename from gpgme/context.h
rename to src/context.h
similarity index 100%
rename from gpgme/conversion.c
rename to src/conversion.c
similarity index 100%
rename from gpgme/data-compat.c
rename to src/data-compat.c
similarity index 100%
rename from gpgme/data-fd.c
rename to src/data-fd.c
similarity index 100%
rename from gpgme/data-mem.c
rename to src/data-mem.c
similarity index 100%
rename from gpgme/data-stream.c
rename to src/data-stream.c
similarity index 100%
rename from gpgme/data-user.c
rename to src/data-user.c
similarity index 100%
rename from gpgme/data.c
rename to src/data.c
similarity index 100%
rename from gpgme/data.h
rename to src/data.h
similarity index 100%
rename from gpgme/debug.c
rename to src/debug.c
similarity index 100%
rename from gpgme/debug.h
rename to src/debug.h
similarity index 100%
rename from gpgme/decrypt-verify.c
rename to src/decrypt-verify.c
similarity index 100%
rename from gpgme/decrypt.c
rename to src/decrypt.c
similarity index 100%
rename from gpgme/delete.c
rename to src/delete.c
similarity index 100%
rename from gpgme/edit.c
rename to src/edit.c
similarity index 100%
rename from gpgme/encrypt-sign.c
rename to src/encrypt-sign.c
similarity index 100%
rename from gpgme/encrypt.c
rename to src/encrypt.c
similarity index 100%
rename from gpgme/engine-backend.h
rename to src/engine-backend.h
similarity index 100%
rename from gpgme/engine-gpgconf.c
rename to src/engine-gpgconf.c
similarity index 100%
rename from gpgme/engine-gpgsm.c
rename to src/engine-gpgsm.c
similarity index 100%
rename from gpgme/engine.c
rename to src/engine.c
similarity index 100%
rename from gpgme/engine.h
rename to src/engine.h
similarity index 100%
rename from gpgme/error.c
rename to src/error.c
similarity index 100%
rename from gpgme/export.c
rename to src/export.c
similarity index 100%
rename from gpgme/funopen.c
rename to src/funopen.c
similarity index 100%
rename from gpgme/genkey.c
rename to src/genkey.c
similarity index 100%
rename from gpgme/get-env.c
rename to src/get-env.c
similarity index 100%
rename from gpgme/getauditlog.c
rename to src/getauditlog.c
similarity index 100%
rename from gpgme/gpgconf.c
rename to src/gpgconf.c
similarity index 100%
rename from gpgme/gpgme-config.in
rename to src/gpgme-config.in
similarity index 100%
rename from gpgme/gpgme-w32spawn.c
rename to src/gpgme-w32spawn.c
similarity index 100%
rename from gpgme/gpgme.c
rename to src/gpgme.c
similarity index 100%
rename from gpgme/gpgme.def
rename to src/gpgme.def
similarity index 100%
rename from gpgme/gpgme.h.in
rename to src/gpgme.h.in
similarity index 100%
rename from gpgme/gpgme.m4
rename to src/gpgme.m4
similarity index 100%
rename from gpgme/import.c
rename to src/import.c
similarity index 100%
rename from gpgme/isascii.c
rename to src/isascii.c
similarity index 100%
rename from gpgme/kdpipeiodevice.h
rename to src/kdpipeiodevice.h
similarity index 100%
rename from gpgme/key.c
rename to src/key.c
similarity index 100%
rename from gpgme/keylist.c
rename to src/keylist.c
similarity index 100%
rename from gpgme/libgpgme.vers
rename to src/libgpgme.vers
similarity index 100%
rename from gpgme/memrchr.c
rename to src/memrchr.c
similarity index 100%
rename from gpgme/mkstatus
rename to src/mkstatus
similarity index 100%
rename from gpgme/op-support.c
rename to src/op-support.c
similarity index 100%
rename from gpgme/ops.h
rename to src/ops.h
similarity index 100%
rename from gpgme/passphrase.c
rename to src/passphrase.c
similarity index 100%
rename from gpgme/posix-io.c
rename to src/posix-io.c
similarity index 100%
rename from gpgme/posix-sema.c
rename to src/posix-sema.c
similarity index 100%
rename from gpgme/posix-util.c
rename to src/posix-util.c
similarity index 100%
rename from gpgme/priv-io.h
rename to src/priv-io.h
similarity index 100%
rename from gpgme/progress.c
rename to src/progress.c
similarity index 100%
rename from gpgme/putc_unlocked.c
rename to src/putc_unlocked.c
similarity index 100%
rename from gpgme/rungpg.c
rename to src/rungpg.c
similarity index 100%
rename from gpgme/sema.h
rename to src/sema.h
similarity index 100%
rename from gpgme/setenv.c
rename to src/setenv.c
similarity index 100%
rename from gpgme/sig-notation.c
rename to src/sig-notation.c
similarity index 100%
rename from gpgme/sign.c
rename to src/sign.c
similarity index 100%
rename from gpgme/signers.c
rename to src/signers.c
similarity index 100%
rename from gpgme/stpcpy.c
rename to src/stpcpy.c
similarity index 100%
rename from gpgme/trust-item.c
rename to src/trust-item.c
similarity index 100%
rename from gpgme/trustlist.c
rename to src/trustlist.c
similarity index 100%
rename from gpgme/ttyname_r.c
rename to src/ttyname_r.c
similarity index 100%
rename from gpgme/util.h
rename to src/util.h
similarity index 100%
rename from gpgme/vasprintf.c
rename to src/vasprintf.c
similarity index 100%
rename from gpgme/verify.c
rename to src/verify.c
similarity index 100%
rename from gpgme/version.c
rename to src/version.c
similarity index 100%
rename from gpgme/w32-glib-io.c
rename to src/w32-glib-io.c
similarity index 100%
rename from gpgme/w32-io.c
rename to src/w32-io.c
similarity index 100%
rename from gpgme/w32-qt-io.cpp
rename to src/w32-qt-io.cpp
similarity index 100%
rename from gpgme/w32-sema.c
rename to src/w32-sema.c
similarity index 100%
rename from gpgme/w32-util.c
rename to src/w32-util.c
similarity index 100%
rename from gpgme/wait-global.c
rename to src/wait-global.c
similarity index 100%
rename from gpgme/wait-private.c
rename to src/wait-private.c
similarity index 100%
rename from gpgme/wait-user.c
rename to src/wait-user.c
similarity index 100%
rename from gpgme/wait.c
rename to src/wait.c
similarity index 100%
rename from gpgme/wait.h
rename to src/wait.h
index 060c12f..088d5ba 100644 (file)
@@ -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
index ceabc99..068f886 100644 (file)
@@ -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)
 
index a0c3520..f295fe6 100644 (file)
@@ -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
index 74b9fba..91a8cf7 100644 (file)
@@ -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.