SSPCPP-363 changed to 64 bit installer to allow correct uninstall from control panel.

[shibboleth/cpp-sp.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 277ca61..cc2eee8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,5 @@
 AUTOMAKE_OPTIONS = foreign
-
-ACLOCAL_AMFLAGS = -I .
+ACLOCAL_AMFLAGS = -I m4
 
 include doxygen.am
 
@@ -10,7 +9,21 @@ WANT_SUBDIRS = @WANT_SUBDIRS@
 
 SUBDIRS = $(WANT_SUBDIRS)
 
-DIST_SUBDIRS = doc schemas configs shibsp shibd adfs util apache nsapi_shib fastcgi odbc-store memcache-store selinux
+DIST_SUBDIRS = \
+       doc \
+       schemas \
+       configs \
+       shibsp \
+       shibd \
+       adfs \
+       plugins \
+       util \
+       apache \
+       nsapi_shib \
+       fastcgi \
+       odbc-store \
+       memcache-store \
+       selinux
 
 if DX_COND_doc
 all-local: doxygen-doc
@@ -22,20 +35,12 @@ dist-hook:
        rm -rf `find $(distdir)/isapi_shib -name .svn`
        rm -rf `find $(distdir)/doc/api -name .svn`
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = @PACKAGE_NAME@.pc
-
 GENFILES = @PACKAGE_NAME@.spec pkginfo Portfile
 
 EXTRA_DIST = $(DX_CONFIG) \
     isapi_shib \
     Shibboleth.sln \
-    libtool.m4 \
-    doxygen.m4 \
-    acx_pthread.m4 \
-    depcomp \
     config_win32.h \
     $(GENFILES) \
     $(GENFILES:%=%.in) \
-    depend \
     postinstall