oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

replace INCLUDES with AM_CPPFLAGS

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@14164 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2004-08-26 11:55:29 +00:00
parent aa94e9451e
commit 0624b4457e
33 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
appl/afsutil/Makefile.am
View File

@@ -2,7 +2,7 @@
include $(top_srcdir)/Makefile.am.common include $(top_srcdir)/Makefile.am.common
INCLUDES += $(INCLUDE_krb4) AM_CPPFLAGS += $(INCLUDE_krb4)
bin_PROGRAMS = afslog pagsh bin_PROGRAMS = afslog pagsh

2
appl/ftp/common/Makefile.am
View File

@@ -2,7 +2,7 @@
include $(top_srcdir)/Makefile.am.common include $(top_srcdir)/Makefile.am.common
INCLUDES += $(INCLUDE_krb4) AM_CPPFLAGS += $(INCLUDE_krb4)
noinst_LIBRARIES = libcommon.a noinst_LIBRARIES = libcommon.a

2
appl/ftp/ftp/Makefile.am
View File

@@ -2,7 +2,7 @@
include $(top_srcdir)/Makefile.am.common 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 bin_PROGRAMS = ftp

2
appl/ftp/ftpd/Makefile.am
View File

@@ -2,7 +2,7 @@
include $(top_srcdir)/Makefile.am.common 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 libexec_PROGRAMS = ftpd

2
appl/kx/Makefile.am
View File

@@ -2,7 +2,7 @@
include $(top_srcdir)/Makefile.am.common include $(top_srcdir)/Makefile.am.common
INCLUDES += $(INCLUDE_krb4) $(X_CFLAGS) AM_CPPFLAGS += $(INCLUDE_krb4) $(X_CFLAGS)
WFLAGS += $(WFLAGS_NOIMPLICITINT) WFLAGS += $(WFLAGS_NOIMPLICITINT)

2
appl/login/Makefile.am
View File

@@ -2,7 +2,7 @@
include $(top_srcdir)/Makefile.am.common include $(top_srcdir)/Makefile.am.common
INCLUDES += $(INCLUDE_krb4) AM_CPPFLAGS += $(INCLUDE_krb4)
man_MANS = login.1 login.access.5 man_MANS = login.1 login.access.5

2
appl/otp/Makefile.am
View File

@@ -2,7 +2,7 @@
include $(top_srcdir)/Makefile.am.common include $(top_srcdir)/Makefile.am.common
INCLUDES += $(INCLUDE_des) AM_CPPFLAGS += $(INCLUDE_des)
bin_PROGRAMS = otp otpprint bin_PROGRAMS = otp otpprint
bin_SUIDS = otp bin_SUIDS = otp

2
appl/popper/Makefile.am
View File

@@ -2,7 +2,7 @@
include $(top_srcdir)/Makefile.am.common include $(top_srcdir)/Makefile.am.common
INCLUDES += $(INCLUDE_krb4) AM_CPPFLAGS += $(INCLUDE_krb4)
noinst_PROGRAMS = pop_debug noinst_PROGRAMS = pop_debug

2
appl/push/Makefile.am
View File

@@ -2,7 +2,7 @@
include $(top_srcdir)/Makefile.am.common include $(top_srcdir)/Makefile.am.common
INCLUDES += $(INCLUDE_krb4) $(INCLUDE_hesiod) AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_hesiod)
bin_SCRIPTS = pfrom bin_SCRIPTS = pfrom

2
appl/rcp/Makefile.am
View File

@@ -2,7 +2,7 @@
include $(top_srcdir)/Makefile.am.common include $(top_srcdir)/Makefile.am.common
INCLUDES += $(INCLUDE_krb4) AM_CPPFLAGS += $(INCLUDE_krb4)
bin_PROGRAMS = rcp bin_PROGRAMS = rcp

2
appl/rsh/Makefile.am
View File

@@ -2,7 +2,7 @@
include $(top_srcdir)/Makefile.am.common include $(top_srcdir)/Makefile.am.common
INCLUDES += $(INCLUDE_krb4) -I$(srcdir)/../login AM_CPPFLAGS += $(INCLUDE_krb4) -I$(srcdir)/../login
bin_PROGRAMS = rsh bin_PROGRAMS = rsh

2
appl/su/Makefile.am
View File

@@ -2,7 +2,7 @@
include $(top_srcdir)/Makefile.am.common include $(top_srcdir)/Makefile.am.common
INCLUDES += $(INCLUDE_krb4) $(INCLUDE_des) AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_des)
bin_PROGRAMS = su bin_PROGRAMS = su
bin_SUIDS = su bin_SUIDS = su

2
appl/telnet/libtelnet/Makefile.am
View File

@@ -2,7 +2,7 @@
include $(top_srcdir)/Makefile.am.common 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 noinst_LIBRARIES = libtelnet.a

2
appl/telnet/telnet/Makefile.am
View File

@@ -2,7 +2,7 @@
include $(top_srcdir)/Makefile.am.common include $(top_srcdir)/Makefile.am.common
INCLUDES += -I$(srcdir)/.. $(INCLUDE_krb4) $(INCLUDE_des) AM_CPPFLAGS += -I$(srcdir)/.. $(INCLUDE_krb4) $(INCLUDE_des)
bin_PROGRAMS = telnet bin_PROGRAMS = telnet

2
appl/telnet/telnetd/Makefile.am
View File

@@ -2,7 +2,7 @@
include $(top_srcdir)/Makefile.am.common include $(top_srcdir)/Makefile.am.common
INCLUDES += -I$(srcdir)/.. $(INCLUDE_krb4) $(INCLUDE_des) AM_CPPFLAGS += -I$(srcdir)/.. $(INCLUDE_krb4) $(INCLUDE_des)
libexec_PROGRAMS = telnetd libexec_PROGRAMS = telnetd

2
appl/xnlock/Makefile.am
View File

@@ -2,7 +2,7 @@
include $(top_srcdir)/Makefile.am.common include $(top_srcdir)/Makefile.am.common
INCLUDES += $(INCLUDE_krb4) $(X_CFLAGS) AM_CPPFLAGS += $(INCLUDE_krb4) $(X_CFLAGS)
WFLAGS += $(WFLAGS_NOIMPLICITINT) WFLAGS += $(WFLAGS_NOIMPLICITINT)

2
include/Makefile.am
View File

@@ -7,7 +7,7 @@ SUBDIRS = kadm5
noinst_PROGRAMS = bits make_crypto noinst_PROGRAMS = bits make_crypto
CHECK_LOCAL = CHECK_LOCAL =
INCLUDES += -DHOST=\"$(CANONICAL_HOST)\" AM_CPPFLAGS += -DHOST=\"$(CANONICAL_HOST)\"
include_HEADERS = krb5-types.h include_HEADERS = krb5-types.h
noinst_HEADERS = crypto-headers.h noinst_HEADERS = crypto-headers.h

2
kadmin/Makefile.am
View File

@@ -2,7 +2,7 @@
include $(top_srcdir)/Makefile.am.common 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 sbin_PROGRAMS = kadmin

2
kdc/Makefile.am
View File

@@ -2,7 +2,7 @@
include $(top_srcdir)/Makefile.am.common 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 bin_PROGRAMS = string2key

2
kpasswd/Makefile.am
View File

@@ -2,7 +2,7 @@
include $(top_srcdir)/Makefile.am.common include $(top_srcdir)/Makefile.am.common
INCLUDES += $(INCLUDE_des) AM_CPPFLAGS += $(INCLUDE_des)
man_MANS = kpasswd.1 kpasswdd.8 man_MANS = kpasswd.1 kpasswdd.8

2
kuser/Makefile.am
View File

@@ -2,7 +2,7 @@
include $(top_srcdir)/Makefile.am.common 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 man_MANS = kinit.1 klist.1 kdestroy.1 kgetcred.1

2
lib/45/Makefile.am
View File

@@ -2,7 +2,7 @@
include $(top_srcdir)/Makefile.am.common include $(top_srcdir)/Makefile.am.common
INCLUDES += $(INCLUDE_krb4) AM_CPPFLAGS += $(INCLUDE_krb4)
lib_LIBRARIES = @EXTRA_LIB45@ lib_LIBRARIES = @EXTRA_LIB45@

2
lib/auth/afskauthlib/Makefile.am
View File

@@ -2,7 +2,7 @@
include $(top_srcdir)/Makefile.am.common include $(top_srcdir)/Makefile.am.common
INCLUDES += $(INCLUDE_krb4) AM_CPPFLAGS += $(INCLUDE_krb4)
DEFS = @DEFS@ DEFS = @DEFS@

4
lib/auth/pam/Makefile.am
View File

@@ -2,7 +2,7 @@
include $(top_srcdir)/Makefile.am.common include $(top_srcdir)/Makefile.am.common
INCLUDES += $(INCLUDE_krb4) AM_CPPFLAGS += $(INCLUDE_krb4)
WFLAGS += $(WFLAGS_NOIMPLICITINT) WFLAGS += $(WFLAGS_NOIMPLICITINT)
@@ -62,6 +62,6 @@ SUFFIXES += .c .o
# XXX inline COMPILE since automake wont add it # XXX inline COMPILE since automake wont add it
.c.o: .c.o:
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CC) $(DEFS) $(DEFAULT_AM_CPPFLAGS) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \
-c `test -f '$<' || echo '$(srcdir)/'`$< -c `test -f '$<' || echo '$(srcdir)/'`$<

4
lib/auth/sia/Makefile.am
View File

@@ -2,7 +2,7 @@
include $(top_srcdir)/Makefile.am.common include $(top_srcdir)/Makefile.am.common
INCLUDES += $(INCLUDE_krb4) AM_CPPFLAGS += $(INCLUDE_krb4)
WFLAGS += $(WFLAGS_NOIMPLICITINT) WFLAGS += $(WFLAGS_NOIMPLICITINT)
@@ -107,6 +107,6 @@ SUFFIXES += .c .o
# XXX inline COMPILE since automake wont add it # XXX inline COMPILE since automake wont add it
.c.o: .c.o:
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CC) $(DEFS) $(DEFAULT_AM_CPPFLAGS) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \
-c `test -f '$<' || echo '$(srcdir)/'`$< -c `test -f '$<' || echo '$(srcdir)/'`$<

2
lib/editline/Makefile.am
View File

@@ -6,7 +6,7 @@ if do_roken_rename
ES = snprintf.c strdup.c ES = snprintf.c strdup.c
endif endif
INCLUDES += $(ROKEN_RENAME) AM_CPPFLAGS += $(ROKEN_RENAME)
man_MANS = editline.3 man_MANS = editline.3

2
lib/gssapi/Makefile.am
View File

@@ -2,7 +2,7 @@
include $(top_srcdir)/Makefile.am.common include $(top_srcdir)/Makefile.am.common
INCLUDES += -I$(srcdir)/../krb5 \ AM_CPPFLAGS += -I$(srcdir)/../krb5 \
-I${srcdir}/../asn1/include \ -I${srcdir}/../asn1/include \
$(INCLUDE_des) \ $(INCLUDE_des) \
$(INCLUDE_krb4) $(INCLUDE_krb4)

2
lib/gssapi/krb5/Makefile.am
View File

@@ -2,7 +2,7 @@
include $(top_srcdir)/Makefile.am.common include $(top_srcdir)/Makefile.am.common
INCLUDES += -I$(srcdir)/../krb5 \ AM_CPPFLAGS += -I$(srcdir)/../krb5 \
-I${srcdir}/../asn1/include \ -I${srcdir}/../asn1/include \
$(INCLUDE_des) \ $(INCLUDE_des) \
$(INCLUDE_krb4) $(INCLUDE_krb4)

4
lib/hdb/Makefile.am
View File

@@ -2,7 +2,7 @@
include $(top_srcdir)/Makefile.am.common 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 = \ BUILT_SOURCES = \
$(foo:.x=.c) \ $(foo:.x=.c) \
@@ -59,7 +59,7 @@ libhdb_la_SOURCES = \
$(hdb_source) \ $(hdb_source) \
$(BUILT_SOURCES) $(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 include_HEADERS = hdb.h hdb_err.h hdb_asn1.h hdb-protos.h hdb-private.h

6
lib/kafs/Makefile.am
View File

@@ -2,7 +2,7 @@
include $(top_srcdir)/Makefile.am.common include $(top_srcdir)/Makefile.am.common
INCLUDES += $(AFS_EXTRA_DEFS) $(ROKEN_RENAME) AM_CPPFLAGS += $(AFS_EXTRA_DEFS) $(ROKEN_RENAME)
if KRB4 if KRB4
DEPLIB_krb4 = $(LIB_krb4) $(LIB_des) DEPLIB_krb4 = $(LIB_krb4) $(LIB_des)
@@ -11,7 +11,7 @@ else
DEPLIB_krb4 = DEPLIB_krb4 =
krb4_am_workaround = krb4_am_workaround =
endif # KRB4 endif # KRB4
INCLUDES += $(krb4_am_workaround) AM_CPPFLAGS += $(krb4_am_workaround)
if KRB5 if KRB5
DEPLIB_krb5 = ../krb5/libkrb5.la DEPLIB_krb5 = ../krb5/libkrb5.la
@@ -20,7 +20,7 @@ else
DEPLIB_krb5 = DEPLIB_krb5 =
krb5_am_workaround = krb5_am_workaround =
endif # KRB5 endif # KRB5
INCLUDES += $(krb5_am_workaround) AM_CPPFLAGS += $(krb5_am_workaround)
if AIX if AIX

2
lib/krb5/Makefile.am
View File

@@ -2,7 +2,7 @@
include $(top_srcdir)/Makefile.am.common 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 bin_PROGRAMS = verify_krb5_conf

2
lib/otp/Makefile.am
View File

@@ -2,7 +2,7 @@
include $(top_srcdir)/Makefile.am.common include $(top_srcdir)/Makefile.am.common
INCLUDES += $(INCLUDE_des) $(ROKEN_RENAME) AM_CPPFLAGS += $(INCLUDE_des) $(ROKEN_RENAME)
noinst_PROGRAMS = otptest noinst_PROGRAMS = otptest

2
lib/sl/Makefile.am
View File

@@ -6,7 +6,7 @@ if do_roken_rename
ES = strtok_r.c snprintf.c strdup.c strupr.c getprogname.c ES = strtok_r.c snprintf.c strdup.c strupr.c getprogname.c
endif endif
INCLUDES += $(ROKEN_RENAME) AM_CPPFLAGS += $(ROKEN_RENAME)
YFLAGS = -d YFLAGS = -d