SOURCES: wxMozilla-seamonkey.patch (NEW) - compilation fix for sea...
ggodlewski
ggodlewski at pld-linux.org
Sun Dec 10 23:21:13 CET 2006
Author: ggodlewski Date: Sun Dec 10 22:21:13 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- compilation fix for seamonkey
---- Files affected:
SOURCES:
wxMozilla-seamonkey.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/wxMozilla-seamonkey.patch
diff -u /dev/null SOURCES/wxMozilla-seamonkey.patch:1.1
--- /dev/null Sun Dec 10 23:21:13 2006
+++ SOURCES/wxMozilla-seamonkey.patch Sun Dec 10 23:21:08 2006
@@ -0,0 +1,1562 @@
+diff -uNr wxmozilla-0.5.6/configure.in wxmozilla-0.5.6.new/configure.in
+--- wxmozilla-0.5.6/configure.in 2006-04-23 16:33:16.000000000 +0200
++++ wxmozilla-0.5.6.new/configure.in 2006-12-10 22:53:50.000000000 +0100
+@@ -1,7 +1,7 @@
+ # Process this file with autoconf to produce a configure script
+ AC_PREREQ([2.52])
+
+-AC_INIT([wxMozilla], [0.5.6], [wxmozilla-devel at lists.sourceforge.net])
++AC_INIT([wxMozilla], [0.5.7], [wxmozilla-devel at lists.sourceforge.net])
+ AC_CONFIG_SRCDIR([src/wxMozillaBrowser.cpp])
+
+ AC_CANONICAL_BUILD
+@@ -12,6 +12,7 @@
+
+ build_python=0
+ use_firefox=0
++use_seamonkey=0
+
+ AC_ARG_ENABLE([python],
+ AS_HELP_STRING([--enable-python],
+@@ -21,6 +22,10 @@
+ AS_HELP_STRING([--enable-firefox],
+ [build against Firefox instead of Mozilla]),
+ [use_firefox="$enableval"])
++AC_ARG_ENABLE([seamonkey],
++ AS_HELP_STRING([--enable-seamonkey],
++ [build against Seamonkey instead of Mozilla (1.7-)]),
++ [use_seamonkey="$enableval"])
+
+ AM_INIT_AUTOMAKE
+ AM_MAINTAINER_MODE
+@@ -90,6 +95,11 @@
+ [ --with-mozilla-home=dir Where mozilla libs are at runtime ],
+ [ MOZILLA_HOME="$withval" ])
+
++dnl "0" means "not used"
++WXMOZ_FIREFOX_VERSION=0
++WXMOZ_SEAMONKEY_VERSION=0
++WXMOZ_MOZILLA_VERSION=0
++
+ if test "x$mozilla_includes" != "x" ; then
+ dnl Don't detect mozilla, use given version
+ if test "x$mozilla_libs" = "x" ; then
+@@ -124,6 +134,26 @@
+ MOZILLA_CFLAGS="$MOZILLA_CFLAGS $MOZILLA_GTK_CFLAGS"
+ MOZILLA_LIBS="$MOZILLA_LIBS $MOZILLA_GTK_LIBS"
+ fi
++
++ AC_MSG_CHECKING([for Firefox version])
++ WXMOZ_FIREFOX_VERSION="`$PKG_CONFIG --modversion firefox-gtkmozembed | cut -d. -f1-2`"
++ AC_MSG_RESULT([$WXMOZ_FIREFOX_VERSION])
++ WXMOZ_FIREFOX_VERSION="`echo $WXMOZ_FIREFOX_VERSION | sed -e 's/\.//g'`"
++ elif test "$use_seamonkey" = "yes" ; then
++ PKG_CHECK_MODULES([MOZILLA],
++ [mozilla-nspr >= 1.0 seamonkey-xpcom])
++ mozilla_includes=`$PKG_CONFIG --variable=includedir seamonkey-xpcom`
++ mozilla_libs=`$PKG_CONFIG --variable=libdir seamonkey-xpcom`
++ if test $USE_WXGTK = "yes"; then
++ PKG_CHECK_MODULES([MOZILLA_GTK], [seamonkey-gtkmozembed >= 1.0])
++ MOZILLA_CFLAGS="$MOZILLA_CFLAGS $MOZILLA_GTK_CFLAGS"
++ MOZILLA_LIBS="$MOZILLA_LIBS $MOZILLA_GTK_LIBS"
++ fi
++
++ AC_MSG_CHECKING([for Seamonkey version])
++ WXMOZ_SEAMONKEY_VERSION="`$PKG_CONFIG --modversion seamonkey-gtkmozembed | cut -d. -f1-2`"
++ AC_MSG_RESULT([$WXMOZ_SEAMONKEY_VERSION])
++ WXMOZ_SEAMONKEY_VERSION="`echo $WXMOZ_SEAMONKEY_VERSION | sed -e 's/\.//g'`"
+ else
+ PKG_CHECK_MODULES([MOZILLA],
+ [mozilla-nspr >= 1.3 mozilla-xpcom])
+@@ -134,8 +164,17 @@
+ MOZILLA_CFLAGS="$MOZILLA_CFLAGS $MOZILLA_GTK_CFLAGS"
+ MOZILLA_LIBS="$MOZILLA_LIBS $MOZILLA_GTK_LIBS"
+ fi
++ AC_MSG_CHECKING([for Mozilla version])
++ WXMOZ_MOZILLA_VERSION="`$PKG_CONFIG --modversion mozilla-gtkmozembed | cut -d. -f1-2`"
++ AC_MSG_RESULT([$WXMOZ_MOZILLA_VERSION])
++ WXMOZ_MOZILLA_VERSION="`echo $WXMOZ_MOZILLA_VERSION | sed -e 's/\.//g'`"
+ fi
+ fi
++
++MOZILLA_CFLAGS="$MOZILLA_CFLAGS -DWXMOZ_FIREFOX_VERSION=$WXMOZ_FIREFOX_VERSION"
++MOZILLA_CFLAGS="$MOZILLA_CFLAGS -DWXMOZ_SEAMONKEY_VERSION=$WXMOZ_SEAMONKEY_VERSION"
++MOZILLA_CFLAGS="$MOZILLA_CFLAGS -DWXMOZ_MOZILLA_VERSION=$WXMOZ_MOZILLA_VERSION"
++
+ dnl Additional mozilla settings:
+ if test "x$MOZILLA_HOME" = "x"; then
+ MOZILLA_HOME=$mozilla_libs
+@@ -144,7 +183,7 @@
+ for subdir in unix dom windowwatcher webbrowserpersist appcomps find txtsvc \
+ docshell shistory webshell gfx necko widget content layout \
+ browser webbrwsr uconv embed_base uriloader editor \
+- commandhandler composer pref profdirserviceprovider ; do
++ commandhandler composer pref profile profdirserviceprovider ; do
+ MOZILLA_CFLAGS="$MOZILLA_CFLAGS -I$mozilla_includes/$subdir"
+ done
+ if test $USE_WXGTK = "yes"; then
+diff -uNr wxmozilla-0.5.6/Makefile.in wxmozilla-0.5.6.new/Makefile.in
+--- wxmozilla-0.5.6/Makefile.in 2006-04-23 17:02:04.000000000 +0200
++++ wxmozilla-0.5.6.new/Makefile.in 2006-12-10 22:53:51.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # @configure_input@
+
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,16 +14,11 @@
+
+ @SET_MAKE@
+
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = .
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -35,20 +30,64 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
++build_triplet = @build@
+ host_triplet = @host@
++target_triplet = @target@
++subdir = .
++DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
++ $(srcdir)/Makefile.in $(srcdir)/wxmozilla.pc.in \
++ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
++ config.guess config.sub depcomp install-sh ltmain.sh missing \
++ mkinstalldirs py-compile
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
++ configure.lineno config.status.lineno
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_CLEAN_FILES = wxmozilla.pc
++SOURCES =
++DIST_SOURCES =
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-dvi-recursive install-exec-recursive \
++ install-html-recursive install-info-recursive \
++ install-pdf-recursive install-ps-recursive install-recursive \
++ installcheck-recursive installdirs-recursive pdf-recursive \
++ ps-recursive uninstall-recursive
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++ *) f=$$p;; \
++ esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(pkgconfdir)"
++pkgconfDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(pkgconf_DATA)
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
++ distclean-recursive maintainer-clean-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = src demo wxPython
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++distdir = $(PACKAGE)-$(VERSION)
++top_distdir = $(distdir)
++am__remove_distdir = \
++ { test ! -d $(distdir) \
++ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
++ && rm -fr $(distdir); }; }
++DIST_ARCHIVES = $(distdir).tar.gz
++GZIP_ENV = --best
++distuninstallcheck_listfiles = find . -type f -print
++distcleancheck_listfiles = find . -type f -print
+ ACLOCAL = @ACLOCAL@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_24_FALSE = @BUILD_24_FALSE@
+-BUILD_24_TRUE = @BUILD_24_TRUE@
+-BUILD_PYTHON_FALSE = @BUILD_PYTHON_FALSE@
+-BUILD_PYTHON_TRUE = @BUILD_PYTHON_TRUE@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+@@ -69,9 +108,11 @@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
++GREP = @GREP@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_CONFIG = @GTK_CONFIG@
+ GTK_LIBS = @GTK_LIBS@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -83,9 +124,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
++MKDIR_P = @MKDIR_P@
+ MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_GTK_CFLAGS = @MOZILLA_GTK_CFLAGS@
+ MOZILLA_GTK_LIBS = @MOZILLA_GTK_LIBS@
+@@ -120,105 +160,111 @@
+ WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
+ WX_LIBS = @WX_LIBS@
+ WX_LIBS_STATIC = @WX_LIBS_STATIC@
++WX_RESCOMP = @WX_RESCOMP@
+ WX_VERSION = @WX_VERSION@
+-ac_ct_AR = @ac_ct_AR@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
++datarootdir = @datarootdir@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pkgpyexecdir = @pkgpyexecdir@
+ pkgpythondir = @pkgpythondir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ pyexecdir = @pyexecdir@
+ pythondir = @pythondir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ @BUILD_PYTHON_TRUE at PYSUBDIR = wxPython
+-
+ SUBDIRS = src demo $(PYSUBDIR)
+-
+ pkgconfdir = $(libdir)/pkgconfig
+ pkgconf_DATA = wxmozilla.pc
+-
+ EXTRA_DIST = BUILD.Unix.txt BUILD.Win32.txt doxygen.config icons \
+ wxmozilla.spec build
+
+-subdir = .
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_CLEAN_FILES = wxmozilla.pc
+-DIST_SOURCES =
+-DATA = $(pkgconf_DATA)
+-
+-
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+- ps-recursive install-info-recursive uninstall-info-recursive \
+- all-recursive install-data-recursive install-exec-recursive \
+- installdirs-recursive install-recursive uninstall-recursive \
+- check-recursive installcheck-recursive
+-DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
+- COPYING ChangeLog INSTALL Makefile.am NEWS aclocal.m4 \
+- config.guess config.sub configure configure.in depcomp \
+- install-sh ltmain.sh missing mkinstalldirs py-compile \
+- wxmozilla.pc.in
+-DIST_SUBDIRS = src demo wxPython
+ all: all-recursive
+
+ .SUFFIXES:
+-
+-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+- configure.lineno
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++am--refresh:
++ @:
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++ @for dep in $?; do \
++ case '$(am__configure_deps)' in \
++ *$$dep*) \
++ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
++ cd $(srcdir) && $(AUTOMAKE) --foreign \
++ && exit 0; \
++ exit 1;; \
++ esac; \
++ done; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --foreign Makefile
+-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
+- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++ @case '$?' in \
++ *config.status*) \
++ echo ' $(SHELL) ./config.status'; \
++ $(SHELL) ./config.status;; \
++ *) \
++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
++ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
++ esac;
+
+-$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ $(SHELL) ./config.status --recheck
+-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+- cd $(srcdir) && $(AUTOCONF)
+
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++ cd $(srcdir) && $(AUTOCONF)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+-wxmozilla.pc: $(top_builddir)/config.status wxmozilla.pc.in
++wxmozilla.pc: $(top_builddir)/config.status $(srcdir)/wxmozilla.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+
+ mostlyclean-libtool:
+@@ -229,24 +275,22 @@
+
+ distclean-libtool:
+ -rm -f libtool
+-uninstall-info-am:
+-pkgconfDATA_INSTALL = $(INSTALL_DATA)
+ install-pkgconfDATA: $(pkgconf_DATA)
+ @$(NORMAL_INSTALL)
+- $(mkinstalldirs) $(DESTDIR)$(pkgconfdir)
++ test -z "$(pkgconfdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfdir)"
+ @list='$(pkgconf_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f="`echo $$p | sed -e 's|^.*/||'`"; \
+- echo " $(pkgconfDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgconfdir)/$$f"; \
+- $(pkgconfDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgconfdir)/$$f; \
++ f=$(am__strip_dir) \
++ echo " $(pkgconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfdir)/$$f'"; \
++ $(pkgconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfdir)/$$f"; \
+ done
+
+ uninstall-pkgconfDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(pkgconf_DATA)'; for p in $$list; do \
+- f="`echo $$p | sed -e 's|^.*/||'`"; \
+- echo " rm -f $(DESTDIR)$(pkgconfdir)/$$f"; \
+- rm -f $(DESTDIR)$(pkgconfdir)/$$f; \
++ f=$(am__strip_dir) \
++ echo " rm -f '$(DESTDIR)$(pkgconfdir)/$$f'"; \
++ rm -f "$(DESTDIR)$(pkgconfdir)/$$f"; \
+ done
+
+ # This directory's subdirectories are mostly independent; you can cd
+@@ -256,7 +300,13 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -268,15 +318,20 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++$(RECURSIVE_CLEAN_TARGETS):
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -297,7 +352,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -308,14 +363,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -324,19 +371,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
++tags: TAGS
+
+ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+- if (etags --etags-include --version) >/dev/null 2>&1; then \
++ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
++ empty_fix=.; \
+ else \
+ include_option=--include; \
++ empty_fix=; \
+ fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -f $$subdir/TAGS && \
++ test ! -f $$subdir/TAGS || \
+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+@@ -346,10 +396,11 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- test -z "$(ETAGS_ARGS)$$tags$$unique" \
+- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique
+-
++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++ test -n "$$unique" || unique=$$empty_fix; \
++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++ $$tags $$unique; \
++ fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -372,40 +423,25 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-
+-top_distdir = .
+-distdir = $(PACKAGE)-$(VERSION)
+-
+-am__remove_distdir = \
+- { test ! -d $(distdir) \
+- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+- && rm -fr $(distdir); }; }
+-
+-GZIP_ENV = --best
+-distuninstallcheck_listfiles = find . -type f -print
+-distcleancheck_listfiles = find . -type f -print
+
+ distdir: $(DISTFILES)
+ $(am__remove_distdir)
+- mkdir $(distdir)
+- $(mkinstalldirs) $(distdir)/.
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ test -d $(distdir) || mkdir $(distdir)
++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ list='$(DISTFILES)'; \
++ dist_files=`for file in $$list; do echo $$file; done | \
++ sed -e "s|^$$srcdirstrip/||;t" \
++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++ case $$dist_files in \
++ */*) $(MKDIR_P) `echo "$$dist_files" | \
++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++ sort -u` ;; \
++ esac; \
++ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+- dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
+- else \
+- dir=''; \
+- fi; \
+ if test -d $$d/$$file; then \
++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -418,13 +454,17 @@
+ done
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -d $(distdir)/$$subdir \
+- || mkdir $(distdir)/$$subdir \
++ test -d "$(distdir)/$$subdir" \
++ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
++ distdir=`$(am__cd) $(distdir) && pwd`; \
++ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$(top_distdir)" \
+- distdir=../$(distdir)/$$subdir \
++ top_distdir="$$top_distdir" \
++ distdir="$$distdir/$$subdir" \
++ am__remove_distdir=: \
++ am__skip_length_check=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -435,22 +475,49 @@
<<Diff was trimmed, longer than 597 lines>>
More information about the pld-cvs-commit
mailing list