From 97fbc2dd78ea0cc2225b63ff383802b7c376d9b7 Mon Sep 17 00:00:00 2001 From: David Schleef Date: Thu, 15 Sep 2005 05:51:34 +0000 Subject: [PATCH] as-libtool.mak: Remove Original commit message from CVS: * 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. --- ChangeLog | 8 ++++++++ as-libtool.mak | 47 ----------------------------------------------- m4/as-libtool.m4 | 18 +----------------- m4/as-version.m4 | 3 +-- 4 files changed, 10 insertions(+), 66 deletions(-) delete mode 100644 as-libtool.mak diff --git a/ChangeLog b/ChangeLog index e2a958d..8cac523 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-09-14 David Schleef + + * 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 * gtk-doc-plugins.mak: diff --git a/as-libtool.mak b/as-libtool.mak deleted file mode 100644 index dabbecf..0000000 --- a/as-libtool.mak +++ /dev/null @@ -1,47 +0,0 @@ -# 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 - diff --git a/m4/as-libtool.m4 b/m4/as-libtool.m4 index e25cdc6..c6ba5e5 100644 --- a/m4/as-libtool.m4 +++ b/m4/as-libtool.m4 @@ -4,7 +4,7 @@ dnl autostars m4 macro for libtool versioning dnl Thomas Vander Stichele -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]) @@ -42,20 +42,4 @@ dnl [$1]_LT_LDFLAGS="$[$1]_LT_LDFLAGS -version-info $[$1]_LIBVERSION" 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]) ]) diff --git a/m4/as-version.m4 b/m4/as-version.m4 index e419f03..f99191e 100644 --- a/m4/as-version.m4 +++ b/m4/as-version.m4 @@ -4,7 +4,7 @@ dnl autostars m4 macro for versioning dnl Thomas Vander Stichele -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]) @@ -52,7 +52,6 @@ AC_DEFUN([AS_VERSION], [$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) -- 2.7.4