+2005-09-14 David Schleef <ds@schleef.org>
+
+ * as-libtool.mak: Remove
+ * m4/as-libtool.m4: The libtool bug that this worked around has
+ been fixed.
+ * m4/as-version.m4: Don't define GST_RELEASE, since it causes
+ config.h to be regenerated needlessly, and we don't use it.
+
2005-09-14 Thomas Vander Stichele <thomas at apestaart dot org>
* gtk-doc-plugins.mak:
+++ /dev/null
-# some Makefile.am snippets to fix libtool's breakage w.r.t. DLL
-# building
-#
-#
-# define AS_LIBTOOL_LIB before calling. Sorry, only one lib per
-# directory
-#
-
-
-# add this to EXTRA_DIST
-as_libtool_EXTRA_DIST = $(AS_LIBTOOL_LIB).def
-
-if AS_LIBTOOL_WIN32
-
-as_libtool_noinst_DATA_files = $(AS_LIBTOOL_LIB).lib
-
-as_libtool_LDFLAGS = -no-undefined
-
-# depend on this in install-data-local
-as-libtool-install-data-local:
- $(INSTALL) $(AS_LIBTOOL_LIB).lib $(DESTDIR)$(libdir)
- $(INSTALL) $(AS_LIBTOOL_LIB).def $(DESTDIR)$(libdir)
-
-# depend on this in uninstall-local
-as-libtool-uninstall-local:
- -rm $(DESTDIR)$(libdir)/$(AS_LIBTOOL_LIB).lib
- -rm $(DESTDIR)$(libdir)/$(AS_LIBTOOL_LIB).def
-
-else
-
-as-libtool-install-data-local:
-as-libtool-uninstall-local:
-
-endif
-
-$(AS_LIBTOOL_LIB).lib: $(AS_LIBTOOL_LIB).la $(AS_LIBTOOL_LIB).def
- dlltool -S $(CC) -f "-c" --export-all-symbols --input-def \
- $(srcdir)/$(AS_LIBTOOL_LIB).def --output-lib $@
-
-$(AS_LIBTOOL_LIB).def:
- echo EXPORTS >$(AS_LIBTOOL_LIB).def.tmp
- nm --defined-only -g .libs/$(AS_LIBTOOL_LIB).a | \
- grep ^0 | \
- awk '{ print $$3 }' | \
- sed 's/^/ /' >>$(AS_LIBTOOL_LIB).def.tmp
- mv $(AS_LIBTOOL_LIB).def.tmp $(AS_LIBTOOL_LIB).def
-
dnl Thomas Vander Stichele <thomas at apestaart dot org>
-dnl $Id: as-libtool.m4,v 1.8 2004/06/01 10:05:04 thomasvs Exp $
+dnl $Id: as-libtool.m4,v 1.9 2005/09/15 05:51:34 ds Exp $
dnl AS_LIBTOOL(PREFIX, CURRENT, REVISION, AGE, [RELEASE])
AC_SUBST([$1]_LT_LDFLAGS)
AC_LIBTOOL_DLOPEN
-
- case "$host" in
- *-*-mingw*)
- as_libtool_win32=yes
- enable_static=no
- enable_shared=yes
- ;;
- *)
- as_libtool_win32=no
- ;;
- esac
- AM_CONDITIONAL(AS_LIBTOOL_WIN32, [test "$as_libtool_win32" = "yes"])
-
- m4_pattern_allow([AS_LIBTOOL_WIN32])
- m4_pattern_allow([AS_LIBTOOL_WIN32_TRUE])
- m4_pattern_allow([AS_LIBTOOL_WIN32_FALSE])
])
dnl Thomas Vander Stichele <thomas at apestaart dot org>
-dnl $Id: as-version.m4,v 1.13 2004/06/01 09:44:19 thomasvs Exp $
+dnl $Id: as-version.m4,v 1.14 2005/09/15 05:51:34 ds Exp $
dnl AS_VERSION(PACKAGE, PREFIX, MAJOR, MINOR, MICRO, NANO,
dnl ACTION-IF-NO-NANO, [ACTION-IF-NANO])
[$2]=$VERSION
AC_DEFINE_UNQUOTED([$2], "$[$2]", [Define the version])
AC_SUBST([$2])
- AC_DEFINE_UNQUOTED([$2]_RELEASE, "$[$2]_RELEASE", [Define the release version])
AC_SUBST([$2]_RELEASE)
AC_SUBST([$2]_MAJOR)