Try to be smart about removing .la files.

diff --git a/Makefile.am b/Makefile.am
index fea6bc7..b60ac5d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,9 +17,6 @@ dist-hook:
        rm -rf `find $(distdir)/doc -name Makefile`
        rm -rf `find $(distdir)/isapi_shib -name CVS`
 
-install-exec-hook:
-       rm -f $(DESTDIR)$(libdir)/*.la
-
 WANT_SUBDIRS = @WANT_SUBDIRS@
 
 SUBDIRS = $(WANT_SUBDIRS)

diff --git a/apache/Makefile.am b/apache/Makefile.am
index d7c4d41..af48afd 100644 (file)
--- a/apache/Makefile.am
+++ b/apache/Makefile.am
@@ -18,8 +18,13 @@ mod_shib_13_la_LIBADD = \
 
 if DO_APXS_INSTALL
 install-exec-local::
-       $(APXS) -i -A -n shib_13 .libs/mod_shib_13.so
+       $(APXS) -i -n shib_13 .libs/mod_shib_13.so
+       for la in $(modshib13_LTLIBRARIES) ; do rm -f `$(APXS) -q LIBEXECDIR`/$$la ; done
 endif
+
+install-exec-hook:
+       for la in $(modshib13_LTLIBRARIES) ; do rm -f $(DESTDIR)$(modshib13dir)/$$la ; done
+
 endif
 
 if BUILD_AP20
@@ -34,8 +39,13 @@ mod_shib_20_la_LIBADD = \
 
 if DO_APXS2_INSTALL
 install-exec-local::
-       $(APXS2) -i -A -n shib_20 .libs/mod_shib_20.so
+       $(APXS2) -i -n shib_20 .libs/mod_shib_20.so
+       for la in $(modshib20_LTLIBRARIES) ; do rm -f `$(APXS2) -q LIBEXECDIR`/$$la ; done
 endif 
+
+install-exec-hook:
+       for la in $(modshib20_LTLIBRARIES) ; do rm -f $(DESTDIR)$(modshib20dir)/$$la ; done
+
 endif
 
 EXTRA_DIST = mod_apache.cpp

diff --git a/oncrpc/Makefile.am b/oncrpc/Makefile.am
index e753ebd..cd4d0f2 100644 (file)
--- a/oncrpc/Makefile.am
+++ b/oncrpc/Makefile.am
@@ -61,3 +61,6 @@ EXTRA_DIST = \
   nt.c \
   portmap.c \
   resource.h
+
+install-exec-hook:
+       for la in $(lib_LTLIBRARIES) ; do rm -f $(DESTDIR)$(libdir)/$$la ; done

diff --git a/shib-mysql-ccache/Makefile.am b/shib-mysql-ccache/Makefile.am
index baede32..28c11a3 100644 (file)
--- a/shib-mysql-ccache/Makefile.am
+++ b/shib-mysql-ccache/Makefile.am
@@ -16,5 +16,8 @@ shib_mysql_ccache_la_SOURCES = \
 
 shib_mysql_ccache_la_LDFLAGS = -module -avoid-version
 
+install-exec-hook:
+       for la in $(plugin_LTLIBRARIES) ; do rm -f $(DESTDIR)$(plugindir)/$$la ; done
+
 EXTRA_DIST = shib_mysql_ccache.dsp
 

diff --git a/shib-target/Makefile.am b/shib-target/Makefile.am
index fd51129..0e053f4 100644 (file)
--- a/shib-target/Makefile.am
+++ b/shib-target/Makefile.am
@@ -63,5 +63,8 @@ shib-paths.h: ${srcdir}/shib-paths.h.in Makefile ${top_builddir}/config.status
        cmp -s $@ $@.tmp || mv $@.tmp $@
        rm -f $@.tmp
 
+install-exec-hook:
+       for la in $(lib_LTLIBRARIES) ; do rm -f $(DESTDIR)$(libdir)/$$la ; done
+
 EXTRA_DIST = shibtarget.dsp shib-paths.h.in
 BUILT_SOURCES = shib-paths.h

diff --git a/shib/Makefile.am b/shib/Makefile.am
index bbca978..bb1a6d3 100644 (file)
--- a/shib/Makefile.am
+++ b/shib/Makefile.am
@@ -22,5 +22,8 @@ libshib_la_SOURCES = \
 # http://sources.redhat.com/autobook/autobook/autobook_91.html
 libshib_la_LDFLAGS = -version-info 5:0:0
 
+install-exec-hook:
+       for la in $(lib_LTLIBRARIES) ; do rm -f $(DESTDIR)$(libdir)/$$la ; done
+
 EXTRA_DIST = shib.dsp shib-threads-win32.cpp
 

diff --git a/xmlproviders/Makefile.am b/xmlproviders/Makefile.am
index 8c10d9f..f0b3051 100644 (file)
--- a/xmlproviders/Makefile.am
+++ b/xmlproviders/Makefile.am
@@ -24,5 +24,8 @@ xmlproviders_la_SOURCES = \
 
 xmlproviders_la_LDFLAGS = -module -avoid-version
 
+install-exec-hook:
+       for la in $(plugin_LTLIBRARIES) ; do rm -f $(DESTDIR)$(plugindir)/$$la ; done
+
 EXTRA_DIST = xmlproviders.dsp