use JSON instead of DDF marshalling

[mech_eap.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index bc6c572..d2c8583 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,16 +7,16 @@ gssdir = $(libdir)/gss
 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 \
+mech_eap_la_CFLAGS   = -Werror -Wall -Wunused-parameter \
                        @KRB5_CFLAGS@ @EAP_CFLAGS@ @RADSEC_CFLAGS@ @TARGET_CFLAGS@
-mech_eap_la_CXXFLAGS = -g -Wall \
+mech_eap_la_CXXFLAGS = -Werror -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@
+                      @SHIBRESOLVER_LIBS@ @SHIBSP_LIBS@ @JANSSON_LIBS@
 
 mech_eap_la_SOURCES =                          \
        accept_sec_context.c                    \
@@ -68,13 +68,14 @@ mech_eap_la_SOURCES =                       \
        store_cred.c                            \
        unwrap.c                                \
        unwrap_iov.c                            \
+       userok.c                                \
        util_attr.cpp                           \
+       util_base64.c                           \
        util_buffer.c                           \
        util_context.c                          \
        util_cksum.c                            \
        util_cred.c                             \
        util_crypt.c                            \
-       util_exts.c                             \
        util_krb.c                              \
        util_lucid.c                            \
        util_mech.c                             \
@@ -84,6 +85,7 @@ mech_eap_la_SOURCES =                         \
        util_radius.cpp                         \
        util_saml.cpp                           \
        util_shib.cpp                           \
+       util_sm.c                               \
        util_token.c                            \
        verify_mic.c                            \
        wrap.c                                  \
@@ -91,9 +93,13 @@ mech_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
@@ -110,8 +116,6 @@ endif
 gsseap_err.h gsseap_err.c: gsseap_err.et
        $(COMPILE_ET) $<
 
-
-
 radsec_err.h radsec_err.c: radsec_err.et
        $(COMPILE_ET) $<