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

diff --git a/Makefile.am b/Makefile.am
index f44d87b..bc6c572 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,15 +8,15 @@ 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@
+			@KRB5_CFLAGS@ @EAP_CFLAGS@ @RADSEC_CFLAGS@ @TARGET_CFLAGS@
 mech_eap_la_CXXFLAGS = -g -Wall \
-			@EAP_CFLAGS@ @RADSEC_CFLAGS@ @KRB5_CFLAGS@ \
-		        @SHIBSP_CXXFLAGS@ @SHIBRESOLVER_CXXFLAGS@ @TARGET_CFLAGS@
+			@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			\
@@ -94,6 +94,7 @@ mech_eap_la_SOURCES =    			\
 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 +105,15 @@ 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.c: gsseap_err.et
+	$(COMPILE_ET) $<
 
-gsseap_err.h: gsseap_err.et
-	$(prefix)/bin/compile_et $<
 
-gsseap_err.c: gsseap_err.h
 
-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