aboutsummaryrefslogtreecommitdiffstats
path: root/g10
diff options
context:
space:
mode:
Diffstat (limited to 'g10')
-rw-r--r--g10/ChangeLog4
-rw-r--r--g10/Makefile.am5
2 files changed, 6 insertions, 3 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 5fa1bcbc7..5526cb182 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-24 Werner Koch <[email protected]>
+
+ * Makefile.am: Make use of AM_CFLAGS and AM_LDFLAGS.
+
2003-03-21 David Shaw <[email protected]>
* status.c (do_get_from_fd): Accept 'y' as well as 'Y' for
diff --git a/g10/Makefile.am b/g10/Makefile.am
index dba2718b4..75f0010e0 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1998,1999,2000,2001,2002,2003 Free Software Foundation, Inc.
#
# This file is part of GnuPG.
#
@@ -22,9 +22,8 @@ INCLUDES = -I.. -I$(top_srcdir)/include -I$(top_srcdir)/intl
EXTRA_DIST = options.skel
# it seems that we can't use this with automake 1.5
#OMIT_DEPENDENCIES = zlib.h zconf.h
-LDFLAGS = @LDFLAGS@
libexecdir = @libexecdir@/@PACKAGE@
-CFLAGS = @CFLAGS@ -DGNUPG_LIBEXECDIR="\"$(libexecdir)\""
+AM_CFLAGS = -DGNUPG_LIBEXECDIR="\"$(libexecdir)\""
needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a @CAPLIBS@
#noinst_PROGRAMS = gpgd