diff options
| -rw-r--r-- | agent/Makefile.am | 2 | ||||
| -rw-r--r-- | common/Makefile.am | 2 | ||||
| -rw-r--r-- | dirmngr/Makefile.am | 2 | ||||
| -rw-r--r-- | g10/Makefile.am | 3 | ||||
| -rw-r--r-- | g13/Makefile.am | 2 | ||||
| -rw-r--r-- | kbx/Makefile.am | 3 | ||||
| -rw-r--r-- | scd/Makefile.am | 2 | ||||
| -rw-r--r-- | sm/Makefile.am | 2 | ||||
| -rw-r--r-- | tools/Makefile.am | 2 |
9 files changed, 9 insertions, 11 deletions
diff --git a/agent/Makefile.am b/agent/Makefile.am index bcf178810..b33593d68 100644 --- a/agent/Makefile.am +++ b/agent/Makefile.am @@ -28,7 +28,7 @@ noinst_PROGRAMS = $(TESTS) EXTRA_DIST = ChangeLog-2011 gpg-agent-w32info.rc -AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common -I$(top_srcdir)/intl +AM_CPPFLAGS = -I$(top_srcdir)/common include $(top_srcdir)/am/cmacros.am diff --git a/common/Makefile.am b/common/Makefile.am index 2ba6dc007..51923e841 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -34,7 +34,7 @@ BUILT_SOURCES = audit-events.h status-codes.h MAINTAINERCLEANFILES = audit-events.h status-codes.h -AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl +AM_CPPFLAGS = AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) $(KSBA_CFLAGS) diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am index c8613bba9..d80dd6d6d 100644 --- a/dirmngr/Makefile.am +++ b/dirmngr/Makefile.am @@ -30,7 +30,7 @@ endif noinst_PROGRAMS = $(module_tests) TESTS = $(module_tests) -AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/common +AM_CPPFLAGS = -I$(top_srcdir)/common include $(top_srcdir)/am/cmacros.am diff --git a/g10/Makefile.am b/g10/Makefile.am index 0a021195a..b66abb84c 100644 --- a/g10/Makefile.am +++ b/g10/Makefile.am @@ -21,8 +21,7 @@ EXTRA_DIST = options.skel distsigkey.gpg ChangeLog-2011 gpg-w32info.rc \ gpg.w32-manifest.in -AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common \ - -I$(top_srcdir)/include -I$(top_srcdir)/intl +AM_CPPFLAGS = -I$(top_srcdir)/common include $(top_srcdir)/am/cmacros.am diff --git a/g13/Makefile.am b/g13/Makefile.am index bbffe0246..7d627cb1d 100644 --- a/g13/Makefile.am +++ b/g13/Makefile.am @@ -22,7 +22,7 @@ EXTRA_DIST = ChangeLog-2011 bin_PROGRAMS = g13 -AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/common +AM_CPPFLAGS = -I$(top_srcdir)/common include $(top_srcdir)/am/cmacros.am diff --git a/kbx/Makefile.am b/kbx/Makefile.am index eb434b6c8..5df2bbaef 100644 --- a/kbx/Makefile.am +++ b/kbx/Makefile.am @@ -20,8 +20,7 @@ EXTRA_DIST = mkerrors -AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common \ - -I$(top_srcdir)/intl +AM_CPPFLAGS = -I$(top_srcdir)/common include $(top_srcdir)/am/cmacros.am diff --git a/scd/Makefile.am b/scd/Makefile.am index f7217e3ad..6212e6150 100644 --- a/scd/Makefile.am +++ b/scd/Makefile.am @@ -21,7 +21,7 @@ EXTRA_DIST = ChangeLog-2011 scdaemon-w32info.rc libexec_PROGRAMS = scdaemon -AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/common +AM_CPPFLAGS = -I$(top_srcdir)/common include $(top_srcdir)/am/cmacros.am diff --git a/sm/Makefile.am b/sm/Makefile.am index 7f6df3a3d..dda3eb8d1 100644 --- a/sm/Makefile.am +++ b/sm/Makefile.am @@ -23,7 +23,7 @@ bin_PROGRAMS = gpgsm AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) $(LIBASSUAN_CFLAGS) -AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common -I$(top_srcdir)/intl +AM_CPPFLAGS = -I$(top_srcdir)/common include $(top_srcdir)/am/cmacros.am if HAVE_W32_SYSTEM diff --git a/tools/Makefile.am b/tools/Makefile.am index 1ba03772a..5c28954f3 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -23,7 +23,7 @@ EXTRA_DIST = \ ccidmon.c ChangeLog-2011 gpg-connect-agent-w32info.rc -AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/common +AM_CPPFLAGS = -I$(top_srcdir)/common include $(top_srcdir)/am/cmacros.am if HAVE_W32_SYSTEM |