Merge remote-tracking branch 'origin/eap-tls'

[mech_eap.git] / mech_eap / Makefile.am

diff --git a/mech_eap/Makefile.am b/mech_eap/Makefile.am
index 5b41921..145188f 100644 (file)
--- a/mech_eap/Makefile.am
+++ b/mech_eap/Makefile.am
@@ -42,13 +42,15 @@ mech_eap_la_CXXFLAGS += \
                        @TARGET_CFLAGS@ $(EAP_CFLAGS)
 mech_eap_la_LDFLAGS  = -avoid-version -module \
                        -export-symbols $(GSSEAP_EXPORTS) -no-undefined \
-                       @RADSEC_LDFLAGS@ @TARGET_LDFLAGS@
+                       @KRB5_LDFLAGS@ @RADSEC_LDFLAGS@ @TARGET_LDFLAGS@ @OPENSSL_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            \
@@ -107,6 +109,7 @@ mech_eap_la_SOURCES =                       \
        util_name.c                             \
        util_oid.c                              \
        util_ordering.c                         \
+       util_radius.cpp                         \
        util_sm.c                               \
        util_tld.c                              \
        util_token.c                            \
@@ -125,15 +128,13 @@ mech_eap_la_SOURCES =                     \
        util_saml.h \
        util_shib.h
 
-<<<<<<< HEAD
 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
-=======
->>>>>>> 8d229bd... make dist: distribute sources
+
 
 if GSSEAP_ENABLE_ACCEPTOR
 
@@ -148,8 +149,7 @@ mech_eap_la_SOURCES +=                              \
        set_name_attribute.c                    \
        util_attr.cpp                           \
        util_base64.c                           \
-       util_json.cpp                           \
-       util_radius.cpp
+       util_json.cpp
 
 if OPENSAML
 mech_eap_la_SOURCES += util_saml.cpp