Rework decoder handling in simple resolver, add IdP/SP names to decoder API, hook...

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

diff --git a/configs/Makefile.am b/configs/Makefile.am
index b5b92d8..f403a34 100644 (file)
--- a/configs/Makefile.am
+++ b/configs/Makefile.am
@@ -11,8 +11,7 @@ pkgsysconf_DATA = \
        shibd \
        apache.config \
        apache2.config \
-       apache22.config \
-       inqueue.pem
+       apache22.config
 
 # The config files are installed "special".  Unlike the entries in
 # pkgsysconf_DATA, these files are installed as "foo.dist" and only
@@ -22,14 +21,14 @@ BUILTCONFIGFILES = \
        shibboleth.xml \
        native.logger \
        shibd.logger \
-       AAP.xml \
-       IQ-metadata.xml \
+       resolver-simple.xml \
        example-metadata.xml
 
 # While BUILTCONFIGFILES are processed, these are not; so we should pull
 # them from SRCDIR.
 CONFIGFILES = \
-       shibboleth.logger \
+       console.logger \
+       syslog.logger \
        accessError.html \
        rmError.html \
        sessionError.html \
@@ -75,10 +74,7 @@ native.logger: ${srcdir}/native.logger.in Makefile ${top_builddir}/config.status
 shibboleth.xml: ${srcdir}/shibboleth.xml.in Makefile ${top_builddir}/config.status
        $(MAKE) do-build-file FILE=$@
 
-AAP.xml: ${srcdir}/AAP.xml.in Makefile ${top_builddir}/config.status
-       $(MAKE) do-build-file FILE=$@
-
-IQ-metadata.xml: ${srcdir}/IQ-metadata.xml.in Makefile ${top_builddir}/config.status
+resolver-simple.xml: ${srcdir}/resolver-simple.xml.in Makefile ${top_builddir}/config.status
        $(MAKE) do-build-file FILE=$@
 
 example-metadata.xml: ${srcdir}/example-metadata.xml.in Makefile ${top_builddir}/config.status
@@ -114,8 +110,7 @@ CLEANFILES = \
        shibd.logger \
        native.logger \
        shibboleth.xml \
-       AAP.xml \
-       IQ-metadata.xml \
+       resolver-simple.xml \
        example-metadata.xml
 
 EXTRA_DIST = .cvsignore \
@@ -126,15 +121,14 @@ EXTRA_DIST = .cvsignore \
        apache2.config.in \
        apache22.config.in \
        shibd.in \
-       shibboleth.logger \
+       console.logger \
+       syslog.logger \
        accessError.html \
        rmError.html \
        sessionError.html \
        metadataError.html \
        sslError.html \
-       AAP.xml.in \
-       IQ-metadata.xml.in \
+       resolver-simple.xml.in \
        example-metadata.xml.in \
-       inqueue.pem \
        sp-example.key \
        sp-example.crt