Merge branch 'windows'

[moonshot.git] / moonshot / mech_eap / Makefile.am

diff --git a/moonshot/mech_eap/Makefile.am b/moonshot/mech_eap/Makefile.am
index 4ccdabe..ba6e8dd 100644 (file)
--- a/moonshot/mech_eap/Makefile.am
+++ b/moonshot/mech_eap/Makefile.am
@@ -6,8 +6,15 @@ 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
 
+if GSSEAP_ENABLE_ACCEPTOR
+GSSEAP_EXPORTS = mech_eap.exports
+else
+GSSEAP_EXPORTS = mech_eap-noacceptor.exports
+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
@@ -21,16 +28,22 @@ mech_eap_la_CXXFLAGS = -Werror -Wall -Wunused-parameter
 endif
 
 mech_eap_la_CPPFLAGS = -DBUILD_GSSEAP_LIB -DSYSCONFDIR=\"${sysconfdir}\" -DDATAROOTDIR=\"${datarootdir}\"
-mech_eap_la_CFLAGS   += @KRB5_CFLAGS@ @RADSEC_CFLAGS@ @TARGET_CFLAGS@ $(EAP_CFLAGS)
-mech_eap_la_CXXFLAGS += @KRB5_CFLAGS@ @RADSEC_CFLAGS@ @SHIBRESOLVER_CXXFLAGS@ @SHIBSP_CXXFLAGS@ @TARGET_CFLAGS@ $(EAP_CFLAGS)
+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@ \
+                       @OPENSAML_CXXFLAGS@ @SHIBRESOLVER_CXXFLAGS@ @SHIBSP_CXXFLAGS@ \
+                       @TARGET_CFLAGS@ $(EAP_CFLAGS)
 mech_eap_la_LDFLAGS  = -avoid-version -module \
-                       -export-symbols $(srcdir)/mech_eap.exports -no-undefined \
+                       -export-symbols $(GSSEAP_EXPORTS) -no-undefined \
                        @RADSEC_LDFLAGS@ @TARGET_LDFLAGS@
-mech_eap_la_LIBADD   = @KRB5_LIBS@ ../libeap/libeap.la @RADSEC_LIBS@ \
-                      @SHIBRESOLVER_LIBS@ @SHIBSP_LIBS@ @JANSSON_LIBS@ $(OS_LIBS) $(LTLIBOBJS)
+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 =                          \
-       accept_sec_context.c                    \
        acquire_cred.c                          \
        acquire_cred_with_password.c            \
        add_cred.c                              \
@@ -39,7 +52,6 @@ mech_eap_la_SOURCES =                         \
        canonicalize_name.c                     \
        compare_name.c                          \
        context_time.c                          \
-       delete_name_attribute.c                 \
        delete_sec_context.c                    \
        display_name.c                          \
        display_name_ext.c                      \
@@ -47,10 +59,8 @@ mech_eap_la_SOURCES =                        \
        duplicate_name.c                        \
        eap_mech.c                              \
        export_name.c                           \
-       export_name_composite.c                 \
        export_sec_context.c                    \
        get_mic.c                               \
-       get_name_attribute.c                    \
        gsseap_err.c                            \
        import_name.c                           \
        import_sec_context.c                    \
@@ -67,21 +77,17 @@ mech_eap_la_SOURCES =                       \
        inquire_names_for_mech.c                \
        inquire_saslname_for_mech.c             \
        inquire_sec_context_by_oid.c            \
-       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                          \
        release_oid.c                           \
-       set_name_attribute.c                    \
        set_cred_option.c                       \
        set_sec_context_option.c                \
        store_cred.c                            \
        unwrap.c                                \
        unwrap_iov.c                            \
-       util_base64.c                           \
        util_buffer.c                           \
        util_context.c                          \
        util_cksum.c                            \
@@ -90,6 +96,7 @@ 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                         \
@@ -102,12 +109,33 @@ mech_eap_la_SOURCES =                     \
        wrap_iov_length.c                       \
        wrap_size_limit.c
 
-BUILT_SOURCES = gsseap_err.c radsec_err.c
-
 if GSSEAP_ENABLE_ACCEPTOR
-mech_eap_la_SOURCES += util_attr.cpp util_json.cpp util_radius.cpp util_shib.cpp util_saml.cpp
+
+mech_eap_la_SOURCES +=                         \
+       accept_sec_context.c                    \
+       delete_name_attribute.c                 \
+       export_name_composite.c                 \
+       get_name_attribute.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
+
+if OPENSAML
+mech_eap_la_SOURCES += util_saml.cpp
 endif
 
+if SHIBRESOLVER
+mech_eap_la_SOURCES += util_shib.cpp
+endif
+
+endif
+
+BUILT_SOURCES = gsseap_err.c radsec_err.c
+
 if GSSEAP_ENABLE_REAUTH
 mech_eap_la_SOURCES += util_reauth.c
 
@@ -124,9 +152,6 @@ radius_ad_la_SOURCES = util_adshim.c
 endif
 endif
 
-if TARGET_WINDOWS
-mech_eap_la_LDFLAGS += -debug
-else
 gsseap_err.h gsseap_err.c: gsseap_err.et
        $(COMPILE_ET) $<
 
@@ -137,4 +162,3 @@ radsec_err.c: radsec_err.h
 
 clean-generic:
        rm -f gsseap_err.[ch] radsec_err.[ch]
-endif