Merge commit '2.5.0' into moonshot-packaging-fixes

[shibboleth/sp.git] / plugins / Makefile.am

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index ab08e71..472088b 100644 (file)
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,32 +1,36 @@
 AUTOMAKE_OPTIONS = foreign
 
-plugindir = $(libdir)/@PACKAGE@
-plugin_LTLIBRARIES = plugins.la
+plugindir = $(libdir)/@PACKAGE_NAME@
+plugin_LTLIBRARIES = plugins.la plugins-lite.la
 
 noinst_HEADERS = \
        internal.h
 
 common_sources = \
-       plugins.cpp
+       plugins.cpp \
+       TimeAccessControl.cpp
 
 plugins_la_SOURCES = \
        ${common_sources} \
-       GSSAPIAttributeExtractor.cpp
+       CaseFoldingAttributeResolver.cpp \
+       GSSAPIAttributeExtractor.cpp \
+       TemplateAttributeResolver.cpp \
+       TransformAttributeResolver.cpp
 
-#plugins_lite_la_SOURCES = \
-#      ${common_sources}
+plugins_lite_la_SOURCES = \
+       ${common_sources}
 
 plugins_la_LIBADD = $(XMLSEC_LIBS) \
        $(top_builddir)/shibsp/libshibsp.la
 
-#plugins_lite_la_LIBADD = $(LITE_LIBS) \
-#      $(top_builddir)/shibsp/libshibsp-lite.la
+plugins_lite_la_LIBADD = $(LITE_LIBS) \
+       $(top_builddir)/shibsp/libshibsp-lite.la
 
 plugins_la_LDFLAGS = -module -avoid-version
-#plugins_lite_la_LDFLAGS = -module -avoid-version
-#plugins_lite_la_CPPFLAGS = -DSHIBSP_LITE
+plugins_lite_la_LDFLAGS = -module -avoid-version
+plugins_lite_la_CPPFLAGS = -DSHIBSP_LITE
 
-install-exec-hook:
+install-data-hook:
        for la in $(plugin_LTLIBRARIES) ; do rm -f $(DESTDIR)$(plugindir)/$$la ; done
 
 EXTRA_DIST = plugins.vcxproj resource.h plugins.rc