X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=mech_eap%2FMakefile.am;h=58d7b2ca3507f5aa51633db911de46698a4e0f96;hb=ede49f1719c3f0e4b1905c152a2e8f511aa0c86c;hp=e794f951d40f0277b5625a154bb5dfe218954185;hpb=7b371ea5f89d20a6e7ecf14c4f17a3550f298523;p=moonshot.git

diff --git a/mech_eap/Makefile.am b/mech_eap/Makefile.am
index e794f95..58d7b2c 100644
--- a/mech_eap/Makefile.am
+++ b/mech_eap/Makefile.am
@@ -6,17 +6,17 @@ gssinclude_HEADERS = gssapi_eap.h
 gssdir = $(libdir)/gss
 gss_LTLIBRARIES = mech_eap.la
 
-mech_eap_la_CPPFLAGS = -DBUILD_GSSEAP_LIB -DSYSCONFDIR=\"${sysconfdir}\"
-mech_eap_la_CFLAGS   = -g -Wall -fno-strict-aliasing \
-			@EAP_CFLAGS@ @KRB5_CFLAGS@ @TARGET_CFLAGS@
-mech_eap_la_CXXFLAGS = -g -Wall \
-			@EAP_CFLAGS@ @KRB5_CFLAGS@ @SHIBSP_CXXFLAGS@ \
-			@SHIBRESOLVER_CXXFLAGS@ @TARGET_CFLAGS@
+mech_eap_la_CPPFLAGS = -DBUILD_GSSEAP_LIB -DSYSCONFDIR=\"${sysconfdir}\" -DDATAROOTDIR=\"${datarootdir}\"
+mech_eap_la_CFLAGS   = -Werror -Wall -Wunused-parameter \
+			@KRB5_CFLAGS@ @EAP_CFLAGS@ @RADSEC_CFLAGS@ @TARGET_CFLAGS@
+mech_eap_la_CXXFLAGS = -Werror -Wall -Wunused-parameter \
+			@KRB5_CFLAGS@ @EAP_CFLAGS@ @RADSEC_CFLAGS@ \
+		        @SHIBRESOLVER_CXXFLAGS@ @SHIBSP_CXXFLAGS@ @TARGET_CFLAGS@
 mech_eap_la_LDFLAGS  = -avoid-version -module \
 			-export-symbols mech_eap.exports -no-undefined \
-			@EAP_LDFLAGS@ @TARGET_LDFLAGS@
-mech_eap_la_LIBADD   = @EAP_LIBS@ @KRB5_LIBS@ @SHIBSP_LIBS@ \
-		       @SHIBRESOLVER_LIBS@ -lfreeradius-client
+			@EAP_LDFLAGS@ @RADSEC_LDFLAGS@ @TARGET_LDFLAGS@
+mech_eap_la_LIBADD   = @KRB5_LIBS@ @EAP_LIBS@ @RADSEC_LIBS@ \
+		       @SHIBRESOLVER_LIBS@ @SHIBSP_LIBS@ @JANSSON_LIBS@
 
 mech_eap_la_SOURCES =    			\
 	accept_sec_context.c			\
@@ -24,6 +24,7 @@ mech_eap_la_SOURCES =    			\
 	acquire_cred_with_password.c		\
 	add_cred.c				\
 	add_cred_with_password.c		\
+	authorize_localname.c			\
 	canonicalize_name.c			\
 	compare_name.c				\
 	context_time.c				\
@@ -39,6 +40,7 @@ mech_eap_la_SOURCES =    			\
 	export_sec_context.c			\
 	get_mic.c				\
 	get_name_attribute.c			\
+	gsseap_err.c				\
 	import_name.c				\
 	import_sec_context.c			\
 	indicate_mechs.c			\
@@ -56,6 +58,7 @@ mech_eap_la_SOURCES =    			\
 	map_name_to_any.c			\
 	process_context_token.c			\
 	pseudo_random.c				\
+	radsec_err.c				\
 	release_any_name_mapping.c		\
 	release_cred.c				\
 	release_name.c				\
@@ -67,12 +70,15 @@ mech_eap_la_SOURCES =    			\
 	unwrap.c				\
 	unwrap_iov.c				\
 	util_attr.cpp				\
+	util_base64.c				\
 	util_buffer.c				\
 	util_context.c				\
 	util_cksum.c				\
 	util_cred.c				\
 	util_crypt.c				\
+	util_json.cpp				\
 	util_krb.c				\
+	util_lucid.c				\
 	util_mech.c				\
 	util_name.c				\
 	util_oid.c				\
@@ -80,6 +86,7 @@ mech_eap_la_SOURCES =    			\
 	util_radius.cpp				\
 	util_saml.cpp				\
 	util_shib.cpp				\
+	util_sm.c				\
 	util_token.c				\
 	verify_mic.c				\
 	wrap.c					\
@@ -87,16 +94,33 @@ mech_eap_la_SOURCES =    			\
 	wrap_iov_length.c			\
 	wrap_size_limit.c
 
+BUILT_SOURCES = gsseap_err.c radsec_err.c
+
 if GSSEAP_ENABLE_REAUTH
 mech_eap_la_SOURCES += util_reauth.c
 
+
+
+if !HEIMDAL
 krb5pluginsdir = $(libdir)/krb5/plugins/authdata
 krb5plugins_LTLIBRARIES = radius_ad.la
 
-radius_ad_la_CFLAGS  = -g -Wall -fno-strict-aliasing \
-			  @EAP_CFLAGS@ @KRB5_CFLAGS@ @TARGET_CFLAGS@
+radius_ad_la_CFLAGS  = -Werror -Wall -Wunused-parameter \
+			@KRB5_CFLAGS@ @EAP_CFLAGS@ @RADSEC_CFLAGS@ @TARGET_CFLAGS@
 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
 endif
+endif
+
+gsseap_err.h gsseap_err.c: gsseap_err.et
+	$(COMPILE_ET) $<
+
+radsec_err.h radsec_err.c: radsec_err.et
+	$(COMPILE_ET) $<
+
+radsec_err.c: radsec_err.h
+
+clean-generic:
+	rm -f gsseap_err.[ch] radsec_err.[ch]