From 5a75df5da14b8557f7d1fcdc1cc2fbaa047a44ed Mon Sep 17 00:00:00 2001 From: Sam hartman Date: Fri, 16 Sep 2011 19:41:51 +0100 Subject: [PATCH] make dist: distribute sources Distribute headers so that make dist works Include headers in built sources to fix dependencies for parallel builds Distribute exports files and require that the resulting library depend on them --- mech_eap/Makefile.am | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/mech_eap/Makefile.am b/mech_eap/Makefile.am index 79b21f6..5f78a77 100644 --- a/mech_eap/Makefile.am +++ b/mech_eap/Makefile.am @@ -1,5 +1,8 @@ AUTOMAKE_OPTIONS = foreign +EXTRA_DIST = gsseap_err.et radsec_err.et \ + mech_eap.exports mech_eap-noacceptor.exports + gssincludedir = $(includedir)/gssapi gssinclude_HEADERS = gssapi_eap.h @@ -26,6 +29,7 @@ OS_LIBS = mech_eap_la_CFLAGS = -Werror -Wall -Wunused-parameter mech_eap_la_CXXFLAGS = -Werror -Wall -Wunused-parameter endif +mech_eap_la_DEPENDENCIES = $(GSSEAP_EXPORTS) mech_eap_la_CPPFLAGS = -DBUILD_GSSEAP_LIB -DSYSCONFDIR=\"${sysconfdir}\" -DDATAROOTDIR=\"${datarootdir}\" mech_eap_la_CFLAGS += \ @@ -106,7 +110,17 @@ mech_eap_la_SOURCES = \ wrap.c \ wrap_iov.c \ wrap_iov_length.c \ - wrap_size_limit.c + wrap_size_limit.c \ + gssapiP_eap.h \ + util_attr.h \ + util_base64.h \ + util.h \ + util_json.h \ + util_radius.h \ + util_reauth.h \ + util_saml.h \ + util_shib.h + if GSSEAP_ENABLE_ACCEPTOR @@ -134,7 +148,7 @@ endif endif -BUILT_SOURCES = gsseap_err.c radsec_err.c +BUILT_SOURCES = gsseap_err.c radsec_err.c gsseap_err.h radsec_err.h if GSSEAP_ENABLE_REAUTH mech_eap_la_SOURCES += util_reauth.c @@ -148,7 +162,7 @@ radius_ad_la_CFLAGS = -Werror -Wall -Wunused-parameter \ radius_ad_la_LDFLAGS = -avoid-version -module \ -export-symbols radius_ad.exports -no-undefined radius_ad_la_LIBADD = @KRB5_LIBS@ -radius_ad_la_SOURCES = util_adshim.c +radius_ad_la_SOURCES = util_adshim.c authdata_plugin.h endif endif -- 2.1.4