build: autogenerate heimdal basics

metze

diff --git a/source/Makefile b/source/Makefile
index 93e3ceb72f44a58e60b90a6c478466aa055f0f54..b0aa009edd2bede4671859f58987c925354e1003 100644 (file)
--- a/source/Makefile
+++ b/source/Makefile
@@ -136,7 +136,7 @@ libraries:: $(STATIC_LIBS) $(SHARED_LIBS)
 modules:: $(PLUGINS)
 headers:: $(PUBLIC_HEADERS) $(DEFAULT_HEADERS)
 manpages:: $(MANPAGES)
-all:: showflags $(ALL_PREDEP) bin/asn1_compile bin/compile_et binaries modules pythonmods libraries headers
+all:: showflags $(ALL_PREDEP) binaries modules pythonmods libraries headers
 everything:: all
 
 LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)=$(builddir)/bin/shared

diff --git a/source/heimdal_build/asn1_deps.pl b/source/heimdal_build/asn1_deps.pl
index 6b7181c4dd337eee079cd7de9f6553f3a175d3a8..6c4d10d262b9c7c193971c1789ddb6d984c92af5 100755 (executable)
--- a/source/heimdal_build/asn1_deps.pl
+++ b/source/heimdal_build/asn1_deps.pl
@@ -29,6 +29,7 @@ if (not defined $options) {
 
 my $header = "$dirname/$prefix.h";
 
+print "basics:: $header\n";
 print "$header: \$(heimdalsrcdir)/$file \$(ASN1C)\n";
 print "\t\@echo \"Compiling ASN1 file \$(heimdalsrcdir)/$file\"\n";
 print "\t\@\$(heimdalbuildsrcdir)/asn1_compile_wrapper.sh \$(builddir) $dirname \$(ASN1C) \$(call abspath,\$(heimdalsrcdir)/$file) $prefix $options\n\n";

diff --git a/source/heimdal_build/et_deps.pl b/source/heimdal_build/et_deps.pl
index 5032d471c79b8e3dd55b0c2e7cfe4214b2af79c7..59144259987a463c2bb61c08d40d653d309421c6 100755 (executable)
--- a/source/heimdal_build/et_deps.pl
+++ b/source/heimdal_build/et_deps.pl
@@ -8,6 +8,7 @@ my $basename = basename($file);
 
 my $header = "$dirname/$basename"; $header =~ s/\.et$/.h/;
 my $source = "$dirname/$basename"; $source =~ s/\.et$/.c/;
+print "basics:: $header\n";
 print "$header $source: \$(heimdalsrcdir)/$file \$(ET_COMPILER)\n";
 print "\t\@echo \"Compiling error table $file\"\n";
 print "\t\@\$(heimdalbuildsrcdir)/et_compile_wrapper.sh \$(builddir) $dirname \$(ET_COMPILER) \$(call abspath,\$(heimdalsrcdir)/$file) $source\n\n";

diff --git a/source/heimdal_build/internal.mk b/source/heimdal_build/internal.mk
index 81c90c8ea2bef3ac9c240cc3a7481bd0271a6b6f..35144343e1a97efbf43c9a0cc81e3f68cb2f2ac0 100644 (file)
--- a/source/heimdal_build/internal.mk
+++ b/source/heimdal_build/internal.mk
@@ -588,9 +588,6 @@ mkinclude perl_path_wrapper.sh asn1_deps.pl lib/hx509/ocsp.asn1 ocsp_asn1 \$\(he
 mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/kx509.asn1 kx509_asn1 \$\(heimdalsrcdir\)/lib/asn1|
 mkinclude perl_path_wrapper.sh asn1_deps.pl lib/hx509/pkcs10.asn1 pkcs10_asn1 \$\(heimdalsrcdir\)/lib/hx509 --preserve-binary=CertificationRequestInfo|
 
-#
-# Ensure to update ./static_deps.mk when you add a new entry here!
-#
 mkinclude perl_path_wrapper.sh et_deps.pl lib/asn1/asn1_err.et \$\(heimdalsrcdir\)/lib/asn1|
 mkinclude perl_path_wrapper.sh et_deps.pl lib/hdb/hdb_err.et \$\(heimdalsrcdir\)/lib/hdb|
 mkinclude perl_path_wrapper.sh et_deps.pl lib/krb5/heim_err.et \$\(heimdalsrcdir\)/lib/krb5|

diff --git a/source/static_deps.mk b/source/static_deps.mk
index 085eae938d3a36c8872946955f6d3f5cde4ca49f..2768ea8ab5c581f21a8672391add533cb0700212 100644 (file)
--- a/source/static_deps.mk
+++ b/source/static_deps.mk
@@ -13,30 +13,5 @@ include/includes.h: \
                $(libcharsetsrcdir)/charset.h \
                $(gen_ndrsrcdir)/misc.h
 
-heimdal_basics: \
-       $(heimdalsrcdir)/lib/hdb/hdb_asn1.h \
-       $(heimdalsrcdir)/lib/gssapi/spnego_asn1.h \
-       $(heimdalsrcdir)/lib/gssapi/gssapi_asn1.h \
-       $(heimdalsrcdir)/lib/asn1/krb5_asn1.h \
-       $(heimdalsrcdir)/lib/asn1/asn1_err.h \
-       $(heimdalsrcdir)/lib/asn1/digest_asn1.h \
-       $(heimdalsrcdir)/lib/asn1/pkcs8_asn1.h \
-       $(heimdalsrcdir)/lib/asn1/pkcs9_asn1.h \
-       $(heimdalsrcdir)/lib/asn1/pkcs12_asn1.h \
-       $(heimdalsrcdir)/lib/asn1/cms_asn1.h \
-       $(heimdalsrcdir)/lib/asn1/rfc2459_asn1.h \
-       $(heimdalsrcdir)/lib/asn1/pkinit_asn1.h \
-       $(heimdalsrcdir)/lib/asn1/kx509_asn1.h \
-       $(heimdalsrcdir)/lib/hx509/ocsp_asn1.h \
-       $(heimdalsrcdir)/lib/hx509/pkcs10_asn1.h \
-       $(heimdalsrcdir)/lib/hdb/hdb_err.h \
-       $(heimdalsrcdir)/lib/krb5/heim_err.h \
-       $(heimdalsrcdir)/lib/krb5/k524_err.h \
-       $(heimdalsrcdir)/lib/krb5/krb_err.h \
-       $(heimdalsrcdir)/lib/krb5/krb5_err.h \
-       $(heimdalsrcdir)/lib/gssapi/gkrb5_err.h \
-       $(heimdalsrcdir)/lib/hx509/hx509_err.h \
-       $(heimdalsrcdir)/lib/wind/wind_err.h
-
 proto::
-basics:: include/includes.h idl proto heimdal_basics
+basics:: include/includes.h idl proto