cleanup unused parameter warnings

[mech_eap.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 336354a..3e5a0a6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,21 +1,24 @@
 AUTOMAKE_OPTIONS = foreign
 
-gssdir = $(libdir)/gss
+gssincludedir = $(includedir)/gssapi
+gssinclude_HEADERS = gssapi_eap.h
 
-gss_LTLIBRARIES = libmech_eap.la
+gssdir = $(libdir)/gss
+gss_LTLIBRARIES = mech_eap.la
 
-libmech_eap_la_CPPFLAGS = -DBUILD_GSSEAP_LIB
-libmech_eap_la_CFLAGS   = -g -Wall -fno-strict-aliasing \
-                         @EAP_CFLAGS@ @KRB5_CFLAGS@ @TARGET_CFLAGS@
-libmech_eap_la_CXXFLAGS = -g -Wall \
-                         @EAP_CFLAGS@ @KRB5_CFLAGS@ @SHIBSP_CXXFLAGS@ \
-                         @SHIBRESOLVER_CXXFLAGS@ @TARGET_CFLAGS@
-libmech_eap_la_LDFLAGS  = -export-symbols mech_eap.exports -version-info 0:0:0 \
-                         -no-undefined \
-                         @EAP_LDFLAGS@ @KRB5_LDFLAGS@ @TARGET_LDFLAGS@
-libmech_eap_la_LIBADD   = @EAP_LIBS@ @KRB5_LIBS@ @SHIBSP_LIBS@ @SHIBRESOLVER_LIBS@
+mech_eap_la_CPPFLAGS = -DBUILD_GSSEAP_LIB -DSYSCONFDIR=\"${sysconfdir}\" -DDATAROOTDIR=\"${datarootdir}\"
+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   = @KRB5_LIBS@ @EAP_LIBS@ @RADSEC_LIBS@ \
+                      @SHIBRESOLVER_LIBS@ @SHIBSP_LIBS@
 
-libmech_eap_la_SOURCES =                       \
+mech_eap_la_SOURCES =                          \
        accept_sec_context.c                    \
        acquire_cred.c                          \
        acquire_cred_with_password.c            \
@@ -36,20 +39,25 @@ libmech_eap_la_SOURCES =                            \
        export_sec_context.c                    \
        get_mic.c                               \
        get_name_attribute.c                    \
+       gsseap_err.c                            \
        import_name.c                           \
        import_sec_context.c                    \
        indicate_mechs.c                        \
        init_sec_context.c                      \
+       inquire_attrs_for_mech.c                \
        inquire_context.c                       \
        inquire_cred.c                          \
        inquire_cred_by_oid.c                   \
+       inquire_mech_for_saslname.c             \
        inquire_mechs_for_name.c                \
        inquire_name.c                          \
        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                          \
@@ -67,6 +75,7 @@ libmech_eap_la_SOURCES =                      \
        util_cred.c                             \
        util_crypt.c                            \
        util_krb.c                              \
+       util_lucid.c                            \
        util_mech.c                             \
        util_name.c                             \
        util_oid.c                              \
@@ -74,6 +83,7 @@ libmech_eap_la_SOURCES =                      \
        util_radius.cpp                         \
        util_saml.cpp                           \
        util_shib.cpp                           \
+       util_sm.c                               \
        util_token.c                            \
        verify_mic.c                            \
        wrap.c                                  \
@@ -81,3 +91,33 @@ libmech_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
+
+radius_ad_la_CFLAGS  = -g -Wall -fno-strict-aliasing \
+                         @EAP_CFLAGS@ @KRB5_CFLAGS@ @TARGET_CFLAGS@
+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
+endif
+endif
+
+gsseap_err.h gsseap_err.c: gsseap_err.et
+       $(COMPILE_ET) $<
+
+radsec_err.h radsec_err.c: radsec_err.et
+       $(COMPILE_ET) $<
+
+radsec_err.c: radsec_err.h
+
+clean-generic:
+       rm -f gsseap_err.[ch] radsec_err.[ch]