1 diff --git a/src/Makefile.am b/src/Makefile.am
2 index fc3acc3..9a86251 100644
5 @@ -279,14 +279,14 @@ gpg-error.def: Makefile gpg-error.def.in
6 # It is correct to use $(CC_FOR_BUILD) here. We want to run the
7 # program at build time.
8 mkerrcodes$(EXEEXT_FOR_BUILD): mkerrcodes.c mkerrcodes.h Makefile
9 - $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) \
10 + $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CFLAGS) $(LDFLAGS_FOR_BUILD) \
11 $(CPPFLAGS_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkerrcodes.c
14 # It is correct to use $(CC_FOR_BUILD) here. We want to run the
15 # program at build time.
16 mkw32errmap$(EXEEXT_FOR_BUILD): mkw32errmap.c mkw32errmap.tab.h Makefile
17 - $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) \
18 + $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CFLAGS) $(LDFLAGS_FOR_BUILD) \
19 $(CPPFLAGS_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkw32errmap.c
22 @@ -300,7 +300,7 @@ errnos-sym.h: Makefile mkstrtable.awk errnos.in
25 mkheader$(EXEEXT_FOR_BUILD): mkheader.c Makefile
26 - $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) \
27 + $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CFLAGS) $(LDFLAGS_FOR_BUILD) \
28 $(CPPFLAGS_FOR_BUILD) -g -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c
30 parts_of_gpg_error_h = \