From 82b26c59659a47250a1a70348321efec265b7c70 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 12 Feb 2004 09:29:14 +0000 Subject: [PATCH] Include cmacros.am for common flags. --- scd/ChangeLog | 4 ++++ scd/Makefile.am | 10 ++++++---- scd/ccid-driver.c | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/scd/ChangeLog b/scd/ChangeLog index f6fc67423..002ad1efc 100644 --- a/scd/ChangeLog +++ b/scd/ChangeLog @@ -1,3 +1,7 @@ +2004-02-12 Werner Koch + + * Makefile.am: Include cmacros.am for common flags. + 2004-01-29 Werner Koch * command.c (reset_notify): Release the application context and diff --git a/scd/Makefile.am b/scd/Makefile.am index c8bf3d0de..89ebf4e05 100644 --- a/scd/Makefile.am +++ b/scd/Makefile.am @@ -18,14 +18,16 @@ ## Process this file with automake to produce Makefile.in -localedir = $(datadir)/locale -INCLUDES = -I../intl -DLOCALEDIR=\"$(localedir)\" - bin_PROGRAMS = scdaemon sc-investigate sc-copykeys -AM_CPPFLAGS = -I$(top_srcdir)/common $(OPENSC_CFLAGS) $(LIBGCRYPT_CFLAGS) \ +AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(top_srcdir)/common + +include $(top_srcdir)/am/cmacros.am + +AM_CFLAGS = $(OPENSC_CFLAGS) $(LIBGCRYPT_CFLAGS) \ $(KSBA_CFLAGS) $(LIBASSUAN_CFLAGS) + card_apps = app-openpgp.c app-nks.c app-dinsig.c scdaemon_SOURCES = \ diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c index f910722eb..ca5620176 100644 --- a/scd/ccid-driver.c +++ b/scd/ccid-driver.c @@ -98,7 +98,7 @@ # include "scdaemon.h" # endif -/* Disable all debgging output for now. */ +/* Disable all debugging output for now. */ #undef DBG_CARD_IO #define DBG_CARD_IO 0