make dist: distribute sources

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

diff --git a/moonshot/mech_eap/Makefile.am b/moonshot/mech_eap/Makefile.am
index 608f339..5b41921 100644 (file)
--- a/moonshot/mech_eap/Makefile.am
+++ b/moonshot/mech_eap/Makefile.am
@@ -1,7 +1,9 @@
 AUTOMAKE_OPTIONS = foreign
 
 EXTRA_DIST = gsseap_err.et radsec_err.et \
-       mech_eap.exports mech_eap-noacceptor.exports 
+       mech_eap.exports mech_eap-noacceptor.exports  radius_ad.exports \
+       LICENSE AUTHORS
+
 
 gssincludedir = $(includedir)/gssapi
 gssinclude_HEADERS = gssapi_eap.h
@@ -123,12 +125,15 @@ 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