fixes for build headers

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3176 ec53bebd-3082-4978-b11e-865c3cabbd6b

include/Makefile.am

@@ -8,9 +8,9 @@ INCLUDES=-DHOST=\"@CANONICAL_HOST@\"
 
 foodir = $(includedir)
 foo_DATA = \
-	asn1.h asn1_err.h bits.h cache.h config_file.h des.h error.h \
+	bits.h cache.h config_file.h des.h error.h \
-	getarg.h gssapi.h hdb.h hdb_asn1.h hdb_err.h heim_err.h kafs.h \
+	getarg.h gssapi.h hdb.h kafs.h \
-	keytab.h krb5.h krb5_err.h md4.h md5.h otp.h parse_time.h \
+	keytab.h krb5.h md4.h md5.h otp.h parse_time.h \
 	parse_units.h roken.h sha.h sl.h store.h @EXTRA_HDRS@
 
 
@@ -21,10 +21,6 @@ CLEANFILES = $(foo_DATA)
 bits.h: bits
 	./bits bits.h
 
-asn1.h:
-	$(LN_S) ../lib/asn1/asn1.h .
-asn1_err.h:
-	$(LN_S) ../lib/error/asn1_err.h .
 cache.h:
 	$(LN_S) $(top_srcdir)/lib/krb5/cache.h .
 config_file.h:
@@ -41,20 +37,12 @@ gssapi.h:
 	$(LN_S) $(top_srcdir)/lib/gssapi/gssapi.h .
 hdb.h:
 	$(LN_S) $(top_srcdir)/lib/hdb/hdb.h .
-hdb_asn1.h:
-	$(LN_S) ../lib/hdb/hdb_asn1.h .
-hdb_err.h:
-	$(LN_S) ../lib/error/hdb_err.h .
-heim_err.h:
-	$(LN_S) ../lib/error/heim_err.h .
 kafs.h:
 	$(LN_S) $(top_srcdir)/lib/kafs/kafs.h .
 keytab.h:
 	$(LN_S) $(top_srcdir)/lib/krb5/keytab.h .
 krb5.h:
 	$(LN_S) $(top_srcdir)/lib/krb5/krb5.h .
-krb5_err.h:
-	$(LN_S) ../lib/error/krb5_err.h .
 md4.h:
 	$(LN_S) $(top_srcdir)/lib/des/md4.h .
 md5.h:

lib/asn1/Makefile.am

@@ -53,6 +53,18 @@ asn1_compile_LDADD = -L../roken -lroken @LEXLIB@
 
 CLEANFILES = lex.c parse.c parse.h asn1.h $(BUILT_SOURCES) $(foo) asn1_files
 
+incdir = includedir
+inc_DATA = asn1.h
+idir = $(top_builddir)/include
+
+all-local:
+	@for i in $(inc_DATA); do \
+		if cmp -s  $$i $(idir)/$$i 2> /dev/null ; then :; else\
+			echo " $(INSTALL_DATA) $$i $(idir)/$$i"; \
+			$(INSTALL_DATA) $$i $(idir)/$$i; \
+		fi ; \
+	done
+
 lex.o: parse.h
 parse.c: parse.h
 

lib/com_err/Makefile.am

@@ -8,10 +8,21 @@ lib_LIBRARIES = liberror.a
 
 SUFFIXES = .et
 
+incdir = $(includedir)
+inc_DATA = asn1_err.h krb5_err.h heim_err.h
+idir = $(top_builddir)/include
+
 CLEANFILES = asn1_err.c asn1_err.h krb5_err.c krb5_err.h heim_err.c heim_err.h
 
 liberror_a_SOURCES = krb5_err.c asn1_err.c error.c heim_err.c
 
+all-local:
+	@for i in $(inc_DATA); do \
+		if cmp -s  $$i $(idir)/$$i 2> /dev/null ; then :; else\
+			echo " $(INSTALL_DATA) $$i $(idir)/$$i"; \
+			$(INSTALL_DATA) $$i $(idir)/$$i; \
+		fi ; \
+	done
 .et.c:
 	$(SHELL) ./compile_et $<
 

lib/error/Makefile.am

@@ -8,10 +8,21 @@ lib_LIBRARIES = liberror.a
 
 SUFFIXES = .et
 
+incdir = $(includedir)
+inc_DATA = asn1_err.h krb5_err.h heim_err.h
+idir = $(top_builddir)/include
+
 CLEANFILES = asn1_err.c asn1_err.h krb5_err.c krb5_err.h heim_err.c heim_err.h
 
 liberror_a_SOURCES = krb5_err.c asn1_err.c error.c heim_err.c
 
+all-local:
+	@for i in $(inc_DATA); do \
+		if cmp -s  $$i $(idir)/$$i 2> /dev/null ; then :; else\
+			echo " $(INSTALL_DATA) $$i $(idir)/$$i"; \
+			$(INSTALL_DATA) $$i $(idir)/$$i; \
+		fi ; \
+	done
 .et.c:
 	$(SHELL) ./compile_et $<