diff --git a/appl/afsutil/Makefile.am b/appl/afsutil/Makefile.am index 1d7638e9e..d10de755b 100644 --- a/appl/afsutil/Makefile.am +++ b/appl/afsutil/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -INCLUDES += $(INCLUDE_krb4) +AM_CPPFLAGS += $(INCLUDE_krb4) bin_PROGRAMS = afslog pagsh diff --git a/appl/ftp/common/Makefile.am b/appl/ftp/common/Makefile.am index adb71a38f..cfe1bb625 100644 --- a/appl/ftp/common/Makefile.am +++ b/appl/ftp/common/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -INCLUDES += $(INCLUDE_krb4) +AM_CPPFLAGS += $(INCLUDE_krb4) noinst_LIBRARIES = libcommon.a diff --git a/appl/ftp/ftp/Makefile.am b/appl/ftp/ftp/Makefile.am index de7117db9..00de43c97 100644 --- a/appl/ftp/ftp/Makefile.am +++ b/appl/ftp/ftp/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -INCLUDES += -I$(srcdir)/../common $(INCLUDE_readline) $(INCLUDE_krb4) $(INCLUDE_des) +AM_CPPFLAGS += -I$(srcdir)/../common $(INCLUDE_readline) $(INCLUDE_krb4) $(INCLUDE_des) bin_PROGRAMS = ftp diff --git a/appl/ftp/ftpd/Makefile.am b/appl/ftp/ftpd/Makefile.am index a55aee5a4..f0b801fcb 100644 --- a/appl/ftp/ftpd/Makefile.am +++ b/appl/ftp/ftpd/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -INCLUDES += -I$(srcdir)/../common $(INCLUDE_krb4) -DFTP_SERVER +AM_CPPFLAGS += -I$(srcdir)/../common $(INCLUDE_krb4) -DFTP_SERVER libexec_PROGRAMS = ftpd diff --git a/appl/kx/Makefile.am b/appl/kx/Makefile.am index 056417c61..c0a6754e2 100644 --- a/appl/kx/Makefile.am +++ b/appl/kx/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -INCLUDES += $(INCLUDE_krb4) $(X_CFLAGS) +AM_CPPFLAGS += $(INCLUDE_krb4) $(X_CFLAGS) WFLAGS += $(WFLAGS_NOIMPLICITINT) diff --git a/appl/login/Makefile.am b/appl/login/Makefile.am index 87dbddb44..46b63a850 100644 --- a/appl/login/Makefile.am +++ b/appl/login/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -INCLUDES += $(INCLUDE_krb4) +AM_CPPFLAGS += $(INCLUDE_krb4) man_MANS = login.1 login.access.5 diff --git a/appl/otp/Makefile.am b/appl/otp/Makefile.am index 16c89c5ec..024004244 100644 --- a/appl/otp/Makefile.am +++ b/appl/otp/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -INCLUDES += $(INCLUDE_des) +AM_CPPFLAGS += $(INCLUDE_des) bin_PROGRAMS = otp otpprint bin_SUIDS = otp diff --git a/appl/popper/Makefile.am b/appl/popper/Makefile.am index 910a98d09..67fe63c94 100644 --- a/appl/popper/Makefile.am +++ b/appl/popper/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -INCLUDES += $(INCLUDE_krb4) +AM_CPPFLAGS += $(INCLUDE_krb4) noinst_PROGRAMS = pop_debug diff --git a/appl/push/Makefile.am b/appl/push/Makefile.am index 7fd26be55..523854c59 100644 --- a/appl/push/Makefile.am +++ b/appl/push/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -INCLUDES += $(INCLUDE_krb4) $(INCLUDE_hesiod) +AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_hesiod) bin_SCRIPTS = pfrom diff --git a/appl/rcp/Makefile.am b/appl/rcp/Makefile.am index e87d90e9a..f8bf0bbb0 100644 --- a/appl/rcp/Makefile.am +++ b/appl/rcp/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -INCLUDES += $(INCLUDE_krb4) +AM_CPPFLAGS += $(INCLUDE_krb4) bin_PROGRAMS = rcp diff --git a/appl/rsh/Makefile.am b/appl/rsh/Makefile.am index fa88c20bf..83d25cc4d 100644 --- a/appl/rsh/Makefile.am +++ b/appl/rsh/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -INCLUDES += $(INCLUDE_krb4) -I$(srcdir)/../login +AM_CPPFLAGS += $(INCLUDE_krb4) -I$(srcdir)/../login bin_PROGRAMS = rsh diff --git a/appl/su/Makefile.am b/appl/su/Makefile.am index 836f559f8..46c564c76 100644 --- a/appl/su/Makefile.am +++ b/appl/su/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -INCLUDES += $(INCLUDE_krb4) $(INCLUDE_des) +AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_des) bin_PROGRAMS = su bin_SUIDS = su diff --git a/appl/telnet/libtelnet/Makefile.am b/appl/telnet/libtelnet/Makefile.am index 8294a3375..948797a2f 100644 --- a/appl/telnet/libtelnet/Makefile.am +++ b/appl/telnet/libtelnet/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -INCLUDES += -I$(srcdir)/.. $(INCLUDE_krb4) $(INCLUDE_des) +AM_CPPFLAGS += -I$(srcdir)/.. $(INCLUDE_krb4) $(INCLUDE_des) noinst_LIBRARIES = libtelnet.a diff --git a/appl/telnet/telnet/Makefile.am b/appl/telnet/telnet/Makefile.am index e3c5a7ff5..86069bcc4 100644 --- a/appl/telnet/telnet/Makefile.am +++ b/appl/telnet/telnet/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -INCLUDES += -I$(srcdir)/.. $(INCLUDE_krb4) $(INCLUDE_des) +AM_CPPFLAGS += -I$(srcdir)/.. $(INCLUDE_krb4) $(INCLUDE_des) bin_PROGRAMS = telnet diff --git a/appl/telnet/telnetd/Makefile.am b/appl/telnet/telnetd/Makefile.am index 24f3b758c..e590e9057 100644 --- a/appl/telnet/telnetd/Makefile.am +++ b/appl/telnet/telnetd/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -INCLUDES += -I$(srcdir)/.. $(INCLUDE_krb4) $(INCLUDE_des) +AM_CPPFLAGS += -I$(srcdir)/.. $(INCLUDE_krb4) $(INCLUDE_des) libexec_PROGRAMS = telnetd diff --git a/appl/xnlock/Makefile.am b/appl/xnlock/Makefile.am index 2b62bfe81..9bc8dea20 100644 --- a/appl/xnlock/Makefile.am +++ b/appl/xnlock/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -INCLUDES += $(INCLUDE_krb4) $(X_CFLAGS) +AM_CPPFLAGS += $(INCLUDE_krb4) $(X_CFLAGS) WFLAGS += $(WFLAGS_NOIMPLICITINT) diff --git a/include/Makefile.am b/include/Makefile.am index 36ae57108..ed4251751 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -7,7 +7,7 @@ SUBDIRS = kadm5 noinst_PROGRAMS = bits make_crypto CHECK_LOCAL = -INCLUDES += -DHOST=\"$(CANONICAL_HOST)\" +AM_CPPFLAGS += -DHOST=\"$(CANONICAL_HOST)\" include_HEADERS = krb5-types.h noinst_HEADERS = crypto-headers.h diff --git a/kadmin/Makefile.am b/kadmin/Makefile.am index a1e997cc8..80cf1aa3c 100644 --- a/kadmin/Makefile.am +++ b/kadmin/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -INCLUDES += $(INCLUDE_readline) $(INCLUDE_des) -I$(srcdir)/../lib/krb5 +AM_CPPFLAGS += $(INCLUDE_readline) $(INCLUDE_des) -I$(srcdir)/../lib/krb5 sbin_PROGRAMS = kadmin diff --git a/kdc/Makefile.am b/kdc/Makefile.am index cd65a21f4..09ddfc86a 100644 --- a/kdc/Makefile.am +++ b/kdc/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -INCLUDES += $(INCLUDE_krb4) $(INCLUDE_des) -I$(srcdir)/../lib/krb5 +AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_des) -I$(srcdir)/../lib/krb5 bin_PROGRAMS = string2key diff --git a/kpasswd/Makefile.am b/kpasswd/Makefile.am index 17b38da49..810c106c5 100644 --- a/kpasswd/Makefile.am +++ b/kpasswd/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -INCLUDES += $(INCLUDE_des) +AM_CPPFLAGS += $(INCLUDE_des) man_MANS = kpasswd.1 kpasswdd.8 diff --git a/kuser/Makefile.am b/kuser/Makefile.am index 8955f0d90..2d9e40728 100644 --- a/kuser/Makefile.am +++ b/kuser/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -INCLUDES += $(INCLUDE_krb4) $(INCLUDE_des) -I$(srcdir)/../lib/krb5 +AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_des) -I$(srcdir)/../lib/krb5 man_MANS = kinit.1 klist.1 kdestroy.1 kgetcred.1 diff --git a/lib/45/Makefile.am b/lib/45/Makefile.am index 892821287..11bfde7c5 100644 --- a/lib/45/Makefile.am +++ b/lib/45/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -INCLUDES += $(INCLUDE_krb4) +AM_CPPFLAGS += $(INCLUDE_krb4) lib_LIBRARIES = @EXTRA_LIB45@ diff --git a/lib/auth/afskauthlib/Makefile.am b/lib/auth/afskauthlib/Makefile.am index df5cd5451..8a0ada4b3 100644 --- a/lib/auth/afskauthlib/Makefile.am +++ b/lib/auth/afskauthlib/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -INCLUDES += $(INCLUDE_krb4) +AM_CPPFLAGS += $(INCLUDE_krb4) DEFS = @DEFS@ diff --git a/lib/auth/pam/Makefile.am b/lib/auth/pam/Makefile.am index fdcff21a8..d44cb9388 100644 --- a/lib/auth/pam/Makefile.am +++ b/lib/auth/pam/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -INCLUDES += $(INCLUDE_krb4) +AM_CPPFLAGS += $(INCLUDE_krb4) WFLAGS += $(WFLAGS_NOIMPLICITINT) @@ -62,6 +62,6 @@ SUFFIXES += .c .o # XXX inline COMPILE since automake wont add it .c.o: - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CC) $(DEFS) $(DEFAULT_AM_CPPFLAGS) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \ -c `test -f '$<' || echo '$(srcdir)/'`$< diff --git a/lib/auth/sia/Makefile.am b/lib/auth/sia/Makefile.am index d46164402..0c7b5584c 100644 --- a/lib/auth/sia/Makefile.am +++ b/lib/auth/sia/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -INCLUDES += $(INCLUDE_krb4) +AM_CPPFLAGS += $(INCLUDE_krb4) WFLAGS += $(WFLAGS_NOIMPLICITINT) @@ -107,6 +107,6 @@ SUFFIXES += .c .o # XXX inline COMPILE since automake wont add it .c.o: - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CC) $(DEFS) $(DEFAULT_AM_CPPFLAGS) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \ -c `test -f '$<' || echo '$(srcdir)/'`$< diff --git a/lib/editline/Makefile.am b/lib/editline/Makefile.am index 1a5993b00..fde311f19 100644 --- a/lib/editline/Makefile.am +++ b/lib/editline/Makefile.am @@ -6,7 +6,7 @@ if do_roken_rename ES = snprintf.c strdup.c endif -INCLUDES += $(ROKEN_RENAME) +AM_CPPFLAGS += $(ROKEN_RENAME) man_MANS = editline.3 diff --git a/lib/gssapi/Makefile.am b/lib/gssapi/Makefile.am index b7e31cd56..23c47bfb7 100644 --- a/lib/gssapi/Makefile.am +++ b/lib/gssapi/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -INCLUDES += -I$(srcdir)/../krb5 \ +AM_CPPFLAGS += -I$(srcdir)/../krb5 \ -I${srcdir}/../asn1/include \ $(INCLUDE_des) \ $(INCLUDE_krb4) diff --git a/lib/gssapi/krb5/Makefile.am b/lib/gssapi/krb5/Makefile.am index b7e31cd56..23c47bfb7 100644 --- a/lib/gssapi/krb5/Makefile.am +++ b/lib/gssapi/krb5/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -INCLUDES += -I$(srcdir)/../krb5 \ +AM_CPPFLAGS += -I$(srcdir)/../krb5 \ -I${srcdir}/../asn1/include \ $(INCLUDE_des) \ $(INCLUDE_krb4) diff --git a/lib/hdb/Makefile.am b/lib/hdb/Makefile.am index 3f9aafa73..bd0e067a0 100644 --- a/lib/hdb/Makefile.am +++ b/lib/hdb/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -INCLUDES += -I../asn1 -I$(srcdir)/../asn1 $(INCLUDE_des) +AM_CPPFLAGS += -I../asn1 -I$(srcdir)/../asn1 $(INCLUDE_des) BUILT_SOURCES = \ $(foo:.x=.c) \ @@ -59,7 +59,7 @@ libhdb_la_SOURCES = \ $(hdb_source) \ $(BUILT_SOURCES) -INCLUDES += $(INCLUDE_openldap) +AM_CPPFLAGS += $(INCLUDE_openldap) include_HEADERS = hdb.h hdb_err.h hdb_asn1.h hdb-protos.h hdb-private.h diff --git a/lib/kafs/Makefile.am b/lib/kafs/Makefile.am index 25ce79655..ffe745a9e 100644 --- a/lib/kafs/Makefile.am +++ b/lib/kafs/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -INCLUDES += $(AFS_EXTRA_DEFS) $(ROKEN_RENAME) +AM_CPPFLAGS += $(AFS_EXTRA_DEFS) $(ROKEN_RENAME) if KRB4 DEPLIB_krb4 = $(LIB_krb4) $(LIB_des) @@ -11,7 +11,7 @@ else DEPLIB_krb4 = krb4_am_workaround = endif # KRB4 -INCLUDES += $(krb4_am_workaround) +AM_CPPFLAGS += $(krb4_am_workaround) if KRB5 DEPLIB_krb5 = ../krb5/libkrb5.la @@ -20,7 +20,7 @@ else DEPLIB_krb5 = krb5_am_workaround = endif # KRB5 -INCLUDES += $(krb5_am_workaround) +AM_CPPFLAGS += $(krb5_am_workaround) if AIX diff --git a/lib/krb5/Makefile.am b/lib/krb5/Makefile.am index 802de453d..d7fc80146 100644 --- a/lib/krb5/Makefile.am +++ b/lib/krb5/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -INCLUDES += $(INCLUDE_krb4) $(INCLUDE_des) -I../com_err -I$(srcdir)/../com_err +AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_des) -I../com_err -I$(srcdir)/../com_err bin_PROGRAMS = verify_krb5_conf diff --git a/lib/otp/Makefile.am b/lib/otp/Makefile.am index efbcc9431..5939ddb1e 100644 --- a/lib/otp/Makefile.am +++ b/lib/otp/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -INCLUDES += $(INCLUDE_des) $(ROKEN_RENAME) +AM_CPPFLAGS += $(INCLUDE_des) $(ROKEN_RENAME) noinst_PROGRAMS = otptest diff --git a/lib/sl/Makefile.am b/lib/sl/Makefile.am index ee4eb1fa8..3d9531bf3 100644 --- a/lib/sl/Makefile.am +++ b/lib/sl/Makefile.am @@ -6,7 +6,7 @@ if do_roken_rename ES = strtok_r.c snprintf.c strdup.c strupr.c getprogname.c endif -INCLUDES += $(ROKEN_RENAME) +AM_CPPFLAGS += $(ROKEN_RENAME) YFLAGS = -d