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.
This commit is contained in:
Marcus Brinkmann
parent
6405d54bad
commit
66d0fa1973
@ -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.
|
||||
|
||||
@ -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.
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
10
configure.ac
10
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
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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)
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user