replace INCLUDES with AM_CPPFLAGS
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@14164 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
|
||||
include $(top_srcdir)/Makefile.am.common
|
||||
|
||||
INCLUDES += $(INCLUDE_krb4)
|
||||
AM_CPPFLAGS += $(INCLUDE_krb4)
|
||||
|
||||
bin_PROGRAMS = afslog pagsh
|
||||
|
||||
|
@@ -2,7 +2,7 @@
|
||||
|
||||
include $(top_srcdir)/Makefile.am.common
|
||||
|
||||
INCLUDES += $(INCLUDE_krb4)
|
||||
AM_CPPFLAGS += $(INCLUDE_krb4)
|
||||
|
||||
noinst_LIBRARIES = libcommon.a
|
||||
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -2,7 +2,7 @@
|
||||
|
||||
include $(top_srcdir)/Makefile.am.common
|
||||
|
||||
INCLUDES += $(INCLUDE_krb4) $(X_CFLAGS)
|
||||
AM_CPPFLAGS += $(INCLUDE_krb4) $(X_CFLAGS)
|
||||
|
||||
WFLAGS += $(WFLAGS_NOIMPLICITINT)
|
||||
|
||||
|
@@ -2,7 +2,7 @@
|
||||
|
||||
include $(top_srcdir)/Makefile.am.common
|
||||
|
||||
INCLUDES += $(INCLUDE_krb4)
|
||||
AM_CPPFLAGS += $(INCLUDE_krb4)
|
||||
|
||||
man_MANS = login.1 login.access.5
|
||||
|
||||
|
@@ -2,7 +2,7 @@
|
||||
|
||||
include $(top_srcdir)/Makefile.am.common
|
||||
|
||||
INCLUDES += $(INCLUDE_des)
|
||||
AM_CPPFLAGS += $(INCLUDE_des)
|
||||
|
||||
bin_PROGRAMS = otp otpprint
|
||||
bin_SUIDS = otp
|
||||
|
@@ -2,7 +2,7 @@
|
||||
|
||||
include $(top_srcdir)/Makefile.am.common
|
||||
|
||||
INCLUDES += $(INCLUDE_krb4)
|
||||
AM_CPPFLAGS += $(INCLUDE_krb4)
|
||||
|
||||
noinst_PROGRAMS = pop_debug
|
||||
|
||||
|
@@ -2,7 +2,7 @@
|
||||
|
||||
include $(top_srcdir)/Makefile.am.common
|
||||
|
||||
INCLUDES += $(INCLUDE_krb4) $(INCLUDE_hesiod)
|
||||
AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_hesiod)
|
||||
|
||||
bin_SCRIPTS = pfrom
|
||||
|
||||
|
@@ -2,7 +2,7 @@
|
||||
|
||||
include $(top_srcdir)/Makefile.am.common
|
||||
|
||||
INCLUDES += $(INCLUDE_krb4)
|
||||
AM_CPPFLAGS += $(INCLUDE_krb4)
|
||||
|
||||
bin_PROGRAMS = rcp
|
||||
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -2,7 +2,7 @@
|
||||
|
||||
include $(top_srcdir)/Makefile.am.common
|
||||
|
||||
INCLUDES += $(INCLUDE_krb4) $(X_CFLAGS)
|
||||
AM_CPPFLAGS += $(INCLUDE_krb4) $(X_CFLAGS)
|
||||
|
||||
WFLAGS += $(WFLAGS_NOIMPLICITINT)
|
||||
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -2,7 +2,7 @@
|
||||
|
||||
include $(top_srcdir)/Makefile.am.common
|
||||
|
||||
INCLUDES += $(INCLUDE_des)
|
||||
AM_CPPFLAGS += $(INCLUDE_des)
|
||||
|
||||
man_MANS = kpasswd.1 kpasswdd.8
|
||||
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -2,7 +2,7 @@
|
||||
|
||||
include $(top_srcdir)/Makefile.am.common
|
||||
|
||||
INCLUDES += $(INCLUDE_krb4)
|
||||
AM_CPPFLAGS += $(INCLUDE_krb4)
|
||||
|
||||
lib_LIBRARIES = @EXTRA_LIB45@
|
||||
|
||||
|
@@ -2,7 +2,7 @@
|
||||
|
||||
include $(top_srcdir)/Makefile.am.common
|
||||
|
||||
INCLUDES += $(INCLUDE_krb4)
|
||||
AM_CPPFLAGS += $(INCLUDE_krb4)
|
||||
|
||||
DEFS = @DEFS@
|
||||
|
||||
|
@@ -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)/'`$<
|
||||
|
@@ -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)/'`$<
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -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)
|
||||
|
@@ -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)
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -2,7 +2,7 @@
|
||||
|
||||
include $(top_srcdir)/Makefile.am.common
|
||||
|
||||
INCLUDES += $(INCLUDE_des) $(ROKEN_RENAME)
|
||||
AM_CPPFLAGS += $(INCLUDE_des) $(ROKEN_RENAME)
|
||||
|
||||
noinst_PROGRAMS = otptest
|
||||
|
||||
|
@@ -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
|
||||
|
||||
|
Reference in New Issue
Block a user