X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=mech_eap%2FMakefile.am;h=8c6f64c55839e73d918e9094ab75eb908e3d1c6b;hb=3d5083e8a273503d6d5233195d2ee7cb2e754e6d;hp=0214ca0a3df5a106236536862aa0b3107820b632;hpb=54fa5230688cd4ecef74aaef6ebb3193e24f47f8;p=mech_eap.orig

diff --git a/mech_eap/Makefile.am b/mech_eap/Makefile.am
index 0214ca0..8c6f64c 100644
--- a/mech_eap/Makefile.am
+++ b/mech_eap/Makefile.am
@@ -1,11 +1,15 @@
 AUTOMAKE_OPTIONS = foreign
 
+EXTRA_DIST = gsseap_err.et radsec_err.et \
+	mech_eap.exports mech_eap-noacceptor.exports  radius_ad.exports \
+	LICENSE AUTHORS
+
+
 gssincludedir = $(includedir)/gssapi
 gssinclude_HEADERS = gssapi_eap.h
 
 EAP_CFLAGS = -I$(srcdir)/../libeap/src -I$(srcdir)/../libeap/src/common -I$(srcdir)/../libeap/src/eap_common  \
-	-I$(srcdir)/../libeap/src/utils \
-	-DEAP_TLS -DEAP_PEAP -DEAP_TTLS -DEAP_MD5 -DEAP_MSCHAPv2 -DEAP_GTC -DEAP_OTP -DEAP_LEAP -DEAP_PSK -DEAP_PAX -DEAP_SAKE -DEAP_GPSK -DEAP_GPSK_SHA256 -DEAP_SERVER_IDENTITY -DEAP_SERVER_TLS -DEAP_SERVER_PEAP -DEAP_SERVER_TTLS -DEAP_SERVER_MD5 -DEAP_SERVER_MSCHAPV2 -DEAP_SERVER_GTC -DEAP_SERVER_PSK -DEAP_SERVER_PAX -DEAP_SERVER_SAKE -DEAP_SERVER_GPSK -DEAP_SERVER_GPSK_SHA256 -DIEEE8021X_EAPOL
+	-I$(srcdir)/../libeap/src/utils
 
 if GSSEAP_ENABLE_ACCEPTOR
 GSSEAP_EXPORTS = mech_eap.exports
@@ -16,19 +20,35 @@ endif
 gssdir = $(libdir)/gss
 gss_LTLIBRARIES = mech_eap.la
 
+if TARGET_WINDOWS
+EAP_CFLAGS += -DCONFIG_WIN32_DEFAULTS -DUSE_INTERNAL_CRYPTO
+OS_LIBS = -lshell32 -ladvapi32 -lws2_32 -lcomerr32
+mech_eap_la_CFLAGS   = -Zi
+mech_eap_la_CXXFLAGS = -Zi
+else
+EAP_CFLAGS += -DEAP_TLS -DEAP_PEAP -DEAP_TTLS -DEAP_MD5 -DEAP_MSCHAPv2 -DEAP_GTC -DEAP_OTP -DEAP_LEAP -DEAP_PSK -DEAP_PAX -DEAP_SAKE -DEAP_GPSK -DEAP_GPSK_SHA256 -DEAP_SERVER_IDENTITY -DEAP_SERVER_TLS -DEAP_SERVER_PEAP -DEAP_SERVER_TTLS -DEAP_SERVER_MD5 -DEAP_SERVER_MSCHAPV2 -DEAP_SERVER_GTC -DEAP_SERVER_PSK -DEAP_SERVER_PAX -DEAP_SERVER_SAKE -DEAP_SERVER_GPSK -DEAP_SERVER_GPSK_SHA256 -DIEEE8021X_EAPOL
+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   = -Werror -Wall -Wunused-parameter \
-			@KRB5_CFLAGS@  @RADSEC_CFLAGS@ @TARGET_CFLAGS@ $(EAP_CFLAGS)
-mech_eap_la_CXXFLAGS = -Werror -Wall -Wunused-parameter \
-			@KRB5_CFLAGS@  @RADSEC_CFLAGS@ \
+mech_eap_la_CFLAGS   += \
+			@KRB5_CFLAGS@ @RADSEC_CFLAGS@ @TARGET_CFLAGS@ $(EAP_CFLAGS)
+mech_eap_la_CXXFLAGS += \
+			@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@
+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@
-
 mech_eap_la_SOURCES =    			\
 	acquire_cred.c				\
 	acquire_cred_with_password.c		\
@@ -44,6 +64,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				\
@@ -64,6 +85,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				\
@@ -73,7 +96,6 @@ mech_eap_la_SOURCES =    			\
 	store_cred.c				\
 	unwrap.c				\
 	unwrap_iov.c				\
-	util_base64.c				\
 	util_buffer.c				\
 	util_context.c				\
 	util_cksum.c				\
@@ -82,17 +104,34 @@ 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				\
 	util_sm.c				\
+	util_tld.c				\
 	util_token.c				\
 	verify_mic.c				\
 	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 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
 
@@ -101,10 +140,12 @@ mech_eap_la_SOURCES +=				\
 	delete_name_attribute.c			\
 	export_name_composite.c			\
 	get_name_attribute.c			\
+	inquire_name.c				\
 	map_name_to_any.c			\
 	release_any_name_mapping.c		\
 	set_name_attribute.c			\
 	util_attr.cpp				\
+	util_base64.c				\
 	util_json.cpp				\
 	util_radius.cpp
 
@@ -118,7 +159,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
@@ -132,7 +173,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
 
@@ -146,4 +187,3 @@ radsec_err.c: radsec_err.h
 
 clean-generic:
 	rm -f gsseap_err.[ch] radsec_err.[ch]
-