Don't build static libs for modules.

SVN revision: 37371

4 files changed, 19 insertions, 5 deletions

diff --git a/configure.ac b/configure.ac
index e7b7a29..166fea2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,10 +26,10 @@ AM_PROG_CC_STDC
 AC_HEADER_STDC
 AC_C_CONST
 
-dnl Next four lines is a hack to prevent libtool checking for CXX/F77
+dnl Next two lines is a hack to prevent libtool checking for CXX/F77
 define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
 define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
-AM_PROG_LIBTOOL
+AC_PROG_LIBTOOL
 
 VERSION_CUR=5
 VERSION_REV=2
@@ -60,7 +60,6 @@ case $host_os in
   darwin*) mmx="no";;
 esac
 
-dnl 
 AC_ARG_ENABLE([mmx],
   [AC_HELP_STRING([--enable-mmx], [attempt compiling using x86 mmx assembly @<:@default=auto@:>@])],
   [
diff --git a/imlib2.spec.in b/imlib2.spec.in
index f43b216..ee08815 100644
--- a/imlib2.spec.in
+++ b/imlib2.spec.in
@@ -150,13 +150,12 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/loaders
 %{_libdir}/lib*.so.*
-%{_libdir}/*.la
 
 %files devel
 %defattr(-, root, root, 0755)
 %{_libdir}/*.so
+%{_libdir}/*.la
 %{_libdir}/*.a
-%{_libdir}/imlib2/*/*.a
 %{_libdir}/imlib2/*/*.la
 %{_bindir}/imlib2-config
 %{_libdir}/pkgconfig/*
diff --git a/src/modules/filters/Makefile.am b/src/modules/filters/Makefile.am
index 15c47be..901419f 100644
--- a/src/modules/filters/Makefile.am
+++ b/src/modules/filters/Makefile.am
@@ -15,12 +15,15 @@ EXTRA_DIST = filter_common.h
 testfilter_la_SOURCES = filter_test.c
 testfilter_la_LDFLAGS = -module -avoid-version
 testfilter_la_LIBADD  = $(top_builddir)/src/lib/libImlib2.la
+testfilter_la_LIBTOOLFLAGS = --tag=disable-static
 
 bumpmap_la_SOURCES    = filter_bumpmap.c
 bumpmap_la_LDFLAGS    = -module -avoid-version
 bumpmap_la_LIBADD     = $(top_builddir)/src/lib/libImlib2.la
+bumpmap_la_LIBTOOLFLAGS = --tag=disable-static
 
 colormod_la_SOURCES   = filter_colormod.c
 colormod_la_LDFLAGS   = -module -avoid-version
 colormod_la_LIBADD    = $(top_builddir)/src/lib/libImlib2.la
+colormod_la_LIBTOOLFLAGS = --tag=disable-static
 
diff --git a/src/modules/loaders/Makefile.am b/src/modules/loaders/Makefile.am
index e3960d8..8b884b9 100644
--- a/src/modules/loaders/Makefile.am
+++ b/src/modules/loaders/Makefile.am
@@ -51,51 +51,64 @@ EXTRA_DIST = loader_common.h
 jpeg_la_SOURCES      = loader_jpeg.c
 jpeg_la_LDFLAGS      = -module -avoid-version
 jpeg_la_LIBADD       = @JPEGLIBS@ $(top_builddir)/src/lib/libImlib2.la
+jpeg_la_LIBTOOLFLAGS = --tag=disable-static
 
 png_la_SOURCES       = loader_png.c
 png_la_LDFLAGS       = -module -avoid-version
 png_la_LIBADD        = @PNG_LIBS@ $(top_builddir)/src/lib/libImlib2.la
+png_la_LIBTOOLFLAGS = --tag=disable-static
 
 tiff_la_SOURCES      = loader_tiff.c
 tiff_la_LDFLAGS      = -module -avoid-version
 tiff_la_LIBADD       = @TIFFLIBS@ $(top_builddir)/src/lib/libImlib2.la
+tiff_la_LIBTOOLFLAGS = --tag=disable-static
 
 gif_la_SOURCES       = loader_gif.c
 gif_la_LDFLAGS       = -module -avoid-version
 gif_la_LIBADD        = @GIFLIBS@ $(top_builddir)/src/lib/libImlib2.la
+gif_la_LIBTOOLFLAGS = --tag=disable-static
 
 zlib_la_SOURCES      = loader_zlib.c
 zlib_la_LDFLAGS      = -module -avoid-version
 zlib_la_LIBADD       = @ZLIBLIBS@ $(top_builddir)/src/lib/libImlib2.la
+zlib_la_LIBTOOLFLAGS = --tag=disable-static
 
 bz2_la_SOURCES       = loader_bz2.c
 bz2_la_LDFLAGS       = -module -avoid-version
 bz2_la_LIBADD        = @BZ2LIBS@ $(top_builddir)/src/lib/libImlib2.la
+bz2_la_LIBTOOLFLAGS = --tag=disable-static
 
 id3_la_SOURCES       = loader_id3.c
 id3_la_LDFLAGS       = -module -avoid-version
 id3_la_LIBADD        = @ID3LIBS@ $(top_builddir)/src/lib/libImlib2.la
+id3_la_LIBTOOLFLAGS = --tag=disable-static
 
 pnm_la_SOURCES       = loader_pnm.c
 pnm_la_LDFLAGS       = -module -avoid-version
 pnm_la_LIBADD        = $(top_builddir)/src/lib/libImlib2.la
+pnm_la_LIBTOOLFLAGS = --tag=disable-static
 
 argb_la_SOURCES      = loader_argb.c
 argb_la_LDFLAGS      = -module -avoid-version
 argb_la_LIBADD       = $(top_builddir)/src/lib/libImlib2.la
+argb_la_LIBTOOLFLAGS = --tag=disable-static
 
 bmp_la_SOURCES       = loader_bmp.c
 bmp_la_LDFLAGS       = -module -avoid-version
 bmp_la_LIBADD        = $(top_builddir)/src/lib/libImlib2.la
+bmp_la_LIBTOOLFLAGS = --tag=disable-static
 
 xpm_la_SOURCES       = loader_xpm.c
 xpm_la_LDFLAGS       = -module -avoid-version
 xpm_la_LIBADD        = $(top_builddir)/src/lib/libImlib2.la
+xpm_la_LIBTOOLFLAGS = --tag=disable-static
 
 tga_la_SOURCES       = loader_tga.c
 tga_la_LDFLAGS       = -module -avoid-version
 tga_la_LIBADD        = $(top_builddir)/src/lib/libImlib2.la
+tga_la_LIBTOOLFLAGS = --tag=disable-static
 
 lbm_la_SOURCES       = loader_lbm.c
 lbm_la_LDFLAGS       = -module -avoid-version
 lbm_la_LIBADD        = $(top_builddir)/src/lib/libImlib2.la
+lbm_la_LIBTOOLFLAGS = --tag=disable-static