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

remove include_dir hack

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5608 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1999-03-18 13:55:13 +00:00
parent b4625b09bd
commit 29a275ac1a
6 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cf/Makefile.am.common
View File

@@ -13,10 +13,8 @@ COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
## ugly hack for brokenness in automake, you can't install built ## ugly hack for brokenness in automake, you can't install built
## headers via _HEADERS, and you can't install _DATA in includedir. ## headers via _HEADERS, and you can't install _DATA in includedir.
## set include__DATA to built headers that should be installed
## set build_HEADERZ to headers that should just be installed in build tree ## set build_HEADERZ to headers that should just be installed in build tree
include_dir = $(includedir)
buildinclude = $(top_builddir)/include buildinclude = $(top_builddir)/include
## these aren't detected by automake ## these aren't detected by automake
@@ -45,7 +43,7 @@ install-suid-programs:
install-exec-hook: install-suid-programs install-exec-hook: install-suid-programs
install-build-headers: install-build-headers:
@foo='$(include__DATA) $(include_HEADERS) $(build_HEADERZ)'; \ @foo='$(include_HEADERS) $(build_HEADERZ)'; \
for f in $$foo; do \ for f in $$foo; do \
if test -f "$(srcdir)/$$f"; then file="$(srcdir)/$$f"; \ if test -f "$(srcdir)/$$f"; then file="$(srcdir)/$$f"; \
else file="$$f"; fi; \ else file="$$f"; fi; \

2
include/Makefile.am
View File

@@ -8,7 +8,7 @@ noinst_PROGRAMS = bits
INCLUDES = -DHOST=\"$(CANONICAL_HOST)\" INCLUDES = -DHOST=\"$(CANONICAL_HOST)\"
include__DATA = krb5-types.h include_HEADERS = krb5-types.h
krb5-types.h: bits krb5-types.h: bits
./bits krb5-types.h ./bits krb5-types.h

4
lib/asn1/Makefile.am
View File

@@ -124,9 +124,7 @@ TESTS = check-der
CLEANFILES = lex.c parse.c parse.h asn1.h $(BUILT_SOURCES) $(foo) asn1_files CLEANFILES = lex.c parse.c parse.h asn1.h $(BUILT_SOURCES) $(foo) asn1_files
include__DATA = asn1.h asn1_err.h include_HEADERS = asn1.h asn1_err.h der.h
include_HEADERS = der.h
lex.lo: parse.h lex.lo: parse.h

3
lib/hdb/Makefile.am
View File

@@ -23,8 +23,7 @@ lib_LTLIBRARIES = libhdb.la
libhdb_la_SOURCES = hdb.c common.c db.c ndbm.c $(BUILT_SOURCES) libhdb_la_SOURCES = hdb.c common.c db.c ndbm.c $(BUILT_SOURCES)
include_HEADERS = hdb.h include_HEADERS = hdb.h hdb_err.h hdb_asn1.h
include__DATA = hdb_err.h hdb_asn1.h
libhdb_la_LIBADD = libhdb_la_LIBADD =

3
lib/krb5/Makefile.am
View File

@@ -104,8 +104,7 @@ man_MANS = krb5.conf.5 krb5_warn.3 krb5_openlog.3 \
krb5_425_conv_principal.3 krb5_build_principal.3 krb5_free_principal.3 \ krb5_425_conv_principal.3 krb5_build_principal.3 krb5_free_principal.3 \
krb5_parse_name.3 krb5_sname_to_principal.3 krb5_unparse_name.3 krb5_parse_name.3 krb5_sname_to_principal.3 krb5_unparse_name.3
include_HEADERS = krb5.h krb5-protos.h include_HEADERS = krb5.h krb5-protos.h krb5_err.h heim_err.h
include__DATA = krb5_err.h heim_err.h
CLEANFILES = krb5_err.c krb5_err.h heim_err.c heim_err.h CLEANFILES = krb5_err.c krb5_err.h heim_err.c heim_err.h

6
lib/roken/Makefile.am
View File

@@ -109,10 +109,8 @@ libroken_la_LIBADD = @LTLIBOBJS@
$(LTLIBOBJS) $(libroken_la_OBJECTS): roken.h $(LTLIBOBJS) $(libroken_la_OBJECTS): roken.h
include_HEADERS = base64.h getarg.h parse_time.h parse_units.h \ include_HEADERS = $(err_h) base64.h getarg.h parse_time.h parse_units.h \
resolve.h roken-common.h resolve.h roken.h roken-common.h
include__DATA = roken.h
build_HEADERZ = $(err_h) $(fnmatch_h) $(glob_h) xdbm.h build_HEADERZ = $(err_h) $(fnmatch_h) $(glob_h) xdbm.h