summaryrefslogtreecommitdiffstats
path: root/scd
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2004-02-12 10:29:14 +0100
committerWerner Koch <wk@gnupg.org>2004-02-12 10:29:14 +0100
commit82b26c59659a47250a1a70348321efec265b7c70 (patch)
treec938dfb89b2265442073afa42febbec67e2097cc /scd
parentReplaced INCLUDES by AM_CPPFLAGS. (diff)
downloadgnupg2-82b26c59659a47250a1a70348321efec265b7c70.tar.xz
gnupg2-82b26c59659a47250a1a70348321efec265b7c70.zip
Include cmacros.am for common flags.
Diffstat (limited to 'scd')
-rw-r--r--scd/ChangeLog4
-rw-r--r--scd/Makefile.am10
-rw-r--r--scd/ccid-driver.c2
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 <wk@gnupg.org>
+
+ * Makefile.am: Include cmacros.am for common flags.
+
2004-01-29 Werner Koch <wk@gnupg.org>
* 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