X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=moonshot%2Fmech_eap%2FMakefile.am;h=a652182278ae888ade5f673098c14a1246c1fc34;hb=2ef42df0ecea8745a678fe26ff9b16072b93586b;hp=5f78a778778b8d4242fac2759e71ba6fcd148710;hpb=09b131e86146d51810b72947319ff491ba3663f5;p=moonshot.git

diff --git a/moonshot/mech_eap/Makefile.am b/moonshot/mech_eap/Makefile.am
index 5f78a77..a652182 100644
--- a/moonshot/mech_eap/Makefile.am
+++ b/moonshot/mech_eap/Makefile.am
@@ -1,7 +1,9 @@
 AUTOMAKE_OPTIONS = foreign
 
 EXTRA_DIST = gsseap_err.et radsec_err.et \
-	mech_eap.exports mech_eap-noacceptor.exports 
+	mech_eap.exports mech_eap-noacceptor.exports  radius_ad.exports \
+	LICENSE AUTHORS
+
 
 gssincludedir = $(includedir)/gssapi
 gssinclude_HEADERS = gssapi_eap.h
@@ -33,20 +35,21 @@ mech_eap_la_DEPENDENCIES = $(GSSEAP_EXPORTS)
 
 mech_eap_la_CPPFLAGS = -DBUILD_GSSEAP_LIB -DSYSCONFDIR=\"${sysconfdir}\" -DDATAROOTDIR=\"${datarootdir}\"
 mech_eap_la_CFLAGS   += \
-			@KRB5_CFLAGS@  @RADSEC_CFLAGS@ @TARGET_CFLAGS@ $(EAP_CFLAGS)
+			@KRB5_CFLAGS@ @RADSEC_CFLAGS@ @TARGET_CFLAGS@ $(EAP_CFLAGS)
 mech_eap_la_CXXFLAGS += \
-			@KRB5_CFLAGS@  @RADSEC_CFLAGS@ \
+			@KRB5_CFLAGS@ @RADSEC_CFLAGS@ \
 		        @OPENSAML_CXXFLAGS@ @SHIBRESOLVER_CXXFLAGS@ @SHIBSP_CXXFLAGS@ \
 			@TARGET_CFLAGS@ $(EAP_CFLAGS)
 mech_eap_la_LDFLAGS  = -avoid-version -module \
 			-export-symbols $(GSSEAP_EXPORTS) -no-undefined \
-			@RADSEC_LDFLAGS@ @TARGET_LDFLAGS@
+			@RADSEC_LDFLAGS@ @OPENSSL_LDFLAGS@ @TARGET_LDFLAGS@
 if TARGET_WINDOWS
 mech_eap_la_LDFLAGS += -debug
 endif
 
 mech_eap_la_LIBADD   = @KRB5_LIBS@ ../libeap/libeap.la @RADSEC_LIBS@ \
-		       @OPENSAML_LIBS@ @SHIBRESOLVER_LIBS@ @SHIBSP_LIBS@ @JANSSON_LIBS@
+		       @OPENSAML_LIBS@ @SHIBRESOLVER_LIBS@ @SHIBSP_LIBS@ @JANSSON_LIBS@ \
+		       @OPENSSL_LIBS@
 mech_eap_la_SOURCES =    			\
 	acquire_cred.c				\
 	acquire_cred_with_password.c		\
@@ -62,6 +65,7 @@ mech_eap_la_SOURCES =    			\
 	display_status.c			\
 	duplicate_name.c			\
 	eap_mech.c				\
+	exchange_meta_data.c			\
 	export_name.c				\
 	export_sec_context.c			\
 	get_mic.c				\
@@ -82,6 +86,8 @@ mech_eap_la_SOURCES =    			\
 	inquire_sec_context_by_oid.c		\
 	process_context_token.c			\
 	pseudo_random.c				\
+	query_mechanism_info.c			\
+	query_meta_data.c			\
 	radsec_err.c				\
 	release_cred.c				\
 	release_name.c				\
@@ -99,7 +105,6 @@ mech_eap_la_SOURCES =    			\
 	util_krb.c				\
 	util_lucid.c				\
 	util_mech.c				\
-	util_moonshot.c				\
 	util_name.c				\
 	util_oid.c				\
 	util_ordering.c				\
@@ -121,6 +126,13 @@ mech_eap_la_SOURCES =    			\
 	util_saml.h \
 	util_shib.h
 
+if LIBMOONSHOT
+mech_eap_la_SOURCES += util_moonshot.c
+mech_eap_la_CFLAGS  += @LIBMOONSHOT_CFLAGS@
+mech_eap_la_LDFLAGS += @LIBMOONSHOT_LDFLAGS@
+mech_eap_la_LIBADD  += @LIBMOONSHOT_LIBS@
+endif
+
 
 if GSSEAP_ENABLE_ACCEPTOR