aboutsummaryrefslogtreecommitdiffstats
path: root/scd
diff options
context:
space:
mode:
Diffstat (limited to 'scd')
-rw-r--r--scd/ChangeLog-2011 (renamed from scd/ChangeLog)9
-rw-r--r--scd/Makefile.am10
2 files changed, 14 insertions, 5 deletions
diff --git a/scd/ChangeLog b/scd/ChangeLog-2011
index ce442aa5f..d686058af 100644
--- a/scd/ChangeLog
+++ b/scd/ChangeLog-2011
@@ -1,3 +1,10 @@
+2011-12-02 Werner Koch <[email protected]>
+
+ NB: ChangeLog files are no longer manually maintained. Starting
+ on December 1st, 2011 we put change information only in the GIT
+ commit log, and generate a top-level ChangeLog file from logs at
+ "make dist". See doc/HACKING for details.
+
2011-08-04 Werner Koch <[email protected]>
* pcsc-wrapper.c (handle_open): Remove unused var LISTLEN.
@@ -931,7 +938,7 @@
2006-09-14 Werner Koch <[email protected]>
- Replaced all call gpg_error_from_errno(errno) by
+ Replaced all call gpg_error_from_errno(errno) by
gpg_error_from_syserror().
* command.c (scd_command_handler): Replaced
diff --git a/scd/Makefile.am b/scd/Makefile.am
index ae623ace8..58e2f9b1b 100644
--- a/scd/Makefile.am
+++ b/scd/Makefile.am
@@ -6,22 +6,24 @@
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
-#
+#
# GnuPG is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.
## Process this file with automake to produce Makefile.in
-bin_PROGRAMS = scdaemon
+bin_PROGRAMS = scdaemon
if ! HAVE_W32_SYSTEM
libexec_PROGRAMS = gnupg-pcsc-wrapper
endif
+EXTRA_DIST = ChangeLog-2011
+
AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/common
include $(top_srcdir)/am/cmacros.am
@@ -66,4 +68,4 @@ scdaemon_LDADD = $(libcommonpth) ../jnlib/libjnlib.a ../gl/libgnu.a \
#
gnupg_pcsc_wrapper_SOURCES = pcsc-wrapper.c
gnupg_pcsc_wrapper_LDADD = $(DL_LIBS)
-gnupg_pcsc_wrapper_CFLAGS =
+gnupg_pcsc_wrapper_CFLAGS =