X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mech_eap.git;a=blobdiff_plain;f=Makefile.am;h=3e5a0a60cb710855980cd52e2d463604ae5ef683;hp=f44d87b9dd3e5b07410bd6647c709347ecdb8299;hb=ae79fdae047f980d01b2b4e84ccea52e24d8c7a0;hpb=15c93f06ee6ddefa7e7b095351f6e66698c7cc9e

diff --git a/Makefile.am b/Makefile.am
index f44d87b..3e5a0a6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,16 +7,16 @@ gssdir = $(libdir)/gss
 gss_LTLIBRARIES = mech_eap.la
 
 mech_eap_la_CPPFLAGS = -DBUILD_GSSEAP_LIB -DSYSCONFDIR=\"${sysconfdir}\" -DDATAROOTDIR=\"${datarootdir}\"
-mech_eap_la_CFLAGS   = -g -Wall -fno-strict-aliasing \
-			@EAP_CFLAGS@ @RADSEC_CFLAGS@ @KRB5_CFLAGS@ @TARGET_CFLAGS@
-mech_eap_la_CXXFLAGS = -g -Wall \
-			@EAP_CFLAGS@ @RADSEC_CFLAGS@ @KRB5_CFLAGS@ \
-		        @SHIBSP_CXXFLAGS@ @SHIBRESOLVER_CXXFLAGS@ @TARGET_CFLAGS@
+mech_eap_la_CFLAGS   = -g -O -Wall -Wunused-parameter \
+			@KRB5_CFLAGS@ @EAP_CFLAGS@ @RADSEC_CFLAGS@ @TARGET_CFLAGS@
+mech_eap_la_CXXFLAGS = -g -O -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@ @RADSEC_LDFLAGS@ @TARGET_LDFLAGS@
-mech_eap_la_LIBADD   = @EAP_LIBS@ @RADSEC_LIBS@ @KRB5_LIBS@ @SHIBSP_LIBS@ \
-		       @SHIBRESOLVER_LIBS@
+mech_eap_la_LIBADD   = @KRB5_LIBS@ @EAP_LIBS@ @RADSEC_LIBS@ \
+		       @SHIBRESOLVER_LIBS@ @SHIBSP_LIBS@
 
 mech_eap_la_SOURCES =    			\
 	accept_sec_context.c			\
@@ -74,7 +74,6 @@ mech_eap_la_SOURCES =    			\
 	util_cksum.c				\
 	util_cred.c				\
 	util_crypt.c				\
-	util_exts.c				\
 	util_krb.c				\
 	util_lucid.c				\
 	util_mech.c				\
@@ -84,6 +83,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					\
@@ -91,9 +91,14 @@ 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
 
@@ -104,14 +109,13 @@ radius_ad_la_LDFLAGS = -avoid-version -module \
 radius_ad_la_LIBADD  = @KRB5_LIBS@
 radius_ad_la_SOURCES = util_adshim.c
 endif
+endif
 
-gsseap_err.h: gsseap_err.et
-	$(prefix)/bin/compile_et $<
-
-gsseap_err.c: gsseap_err.h
+gsseap_err.h gsseap_err.c: gsseap_err.et
+	$(COMPILE_ET) $<
 
-radsec_err.h: radsec_err.et
-	$(prefix)/bin/compile_et $<
+radsec_err.h radsec_err.c: radsec_err.et
+	$(COMPILE_ET) $<
 
 radsec_err.c: radsec_err.h