update valgrind to latest upstream version, strlen is not a function in ld.so in latest glibc/eglibc setups, just remove the redirect for now. enable automatic building of debug subpackages. update TODO

69 files changed, 97 insertions, 28462 deletions

diff --git a/package/valgrind/Makefile b/package/valgrind/Makefile
index f936dcbdd..b4c1fd139 100644
--- a/package/valgrind/Makefile
+++ b/package/valgrind/Makefile
@@ -4,15 +4,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		valgrind
-PKG_VERSION:=		3.7.0
+PKG_VERSION:=		3.9.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		a855fda56edf05614f099dca316d1775
+PKG_MD5SUM:=		0947de8112f946b9ce64764af7be6df2
 PKG_DESCR:=		memory management debugging
 PKG_SECTION:=		debug
+PKG_BUILDDEP:=		autotool
 PKG_URL:=		http://valgrind.org/
 PKG_SITES:=		http://valgrind.org/downloads/
 
-PKG_ARCH_DEPENDS:=	x86 x86_64 native arm
+PKG_ARCH_DEPENDS:=	ppc ppc64 mips mipsel mips64 mips64el x86 x86_64 arm native
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
@@ -20,10 +21,13 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,VALGRIND,valgrind,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+AUTOTOOL_STYLE:=	autoreconf
+ifeq ($(ADK_TARGET_LIB_MUSL),y)
+TARGET_CPPFLAGS+=	-D__MUSL__
+endif
 CONFIGURE_ENV+=		ac_cv_file__proc_self_fd=yes \
 			ac_cv_file__proc_self_exe=yes \
 			ac_cv_file__proc_self_maps=yes
-CONFIGURE_ARGS+=	--disable-tls
 
 valgrind-install:
 	$(INSTALL_DIR) $(IDIR_VALGRIND)/usr/bin
diff --git a/package/valgrind/patches/patch-Makefile_all_am b/package/valgrind/patches/patch-Makefile_all_am
deleted file mode 100644
index 159ca73df..000000000
--- a/package/valgrind/patches/patch-Makefile_all_am
+++ /dev/null
@@ -1,14 +0,0 @@
---- valgrind-3.7.0.orig/Makefile.all.am	2011-10-26 23:24:45.000000000 +0200
-+++ valgrind-3.7.0/Makefile.all.am	2013-07-23 12:27:45.000000000 +0200
-@@ -160,9 +160,9 @@ AM_CCASFLAGS_PPC64_LINUX  = $(AM_CPPFLAG
- 
- AM_FLAG_M3264_ARM_LINUX   = @FLAG_M32@
- AM_CFLAGS_ARM_LINUX       = @FLAG_M32@ @PREFERRED_STACK_BOUNDARY@ \
--			 	$(AM_CFLAGS_BASE) -marm -mcpu=cortex-a8
-+			 	$(AM_CFLAGS_BASE) @VGCONF_PLATFORM_ARM_ARCH@
- AM_CCASFLAGS_ARM_LINUX    = $(AM_CPPFLAGS_ARM_LINUX) @FLAG_M32@ \
--				-marm -mcpu=cortex-a8 -g
-+				@VGCONF_PLATFORM_ARM_ARCH@ -g
- 
- AM_FLAG_M3264_X86_DARWIN = -arch i386
- AM_CFLAGS_X86_DARWIN     = $(WERROR) -arch i386 $(AM_CFLAGS_BASE) \
diff --git a/package/valgrind/patches/patch-Makefile_am b/package/valgrind/patches/patch-Makefile_am
new file mode 100644
index 000000000..9dd9e396b
--- /dev/null
+++ b/package/valgrind/patches/patch-Makefile_am
@@ -0,0 +1,10 @@
+--- valgrind-3.9.0.orig/Makefile.am	2013-10-23 12:50:02.000000000 +0200
++++ valgrind-3.9.0/Makefile.am	2013-11-03 15:52:11.000000000 +0100
+@@ -4,7 +4,6 @@ AUTOMAKE_OPTIONS = foreign 1.10 dist-bzi
+ include $(top_srcdir)/Makefile.all.am 
+ 
+ TOOLS =		memcheck \
+-		cachegrind \
+ 		callgrind \
+ 		massif \
+ 		lackey \
diff --git a/package/valgrind/patches/patch-Makefile_in b/package/valgrind/patches/patch-Makefile_in
deleted file mode 100644
index 35d1ff5e1..000000000
--- a/package/valgrind/patches/patch-Makefile_in
+++ /dev/null
@@ -1,522 +0,0 @@
---- valgrind-3.7.0.orig/Makefile.in	2011-11-05 12:26:55.000000000 +0100
-+++ valgrind-3.7.0/Makefile.in	2013-07-23 12:27:52.000000000 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.10.3 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -26,9 +26,8 @@
- 
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkgincludedir = $(includedir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
--pkglibexecdir = $(libexecdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -63,7 +62,6 @@ mkinstalldirs = $(install_sh) -d
- CONFIG_HEADER = config.h
- CONFIG_CLEAN_FILES = valgrind.spec valgrind.pc glibc-2.X.supp \
- 	drd/scripts/download-and-build-splash2
--CONFIG_CLEAN_VPATH_FILES =
- SCRIPTS = $(dist_noinst_SCRIPTS)
- SOURCES =
- DIST_SOURCES =
-@@ -79,65 +77,25 @@ am__vpath_adj = case $$p in \
-     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-     *) f=$$p;; \
-   esac;
--am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
--am__install_max = 40
--am__nobase_strip_setup = \
--  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
--am__nobase_strip = \
--  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
--am__nobase_list = $(am__nobase_strip_setup); \
--  for p in $$list; do echo "$$p $$p"; done | \
--  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
--  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
--    if (++n[$$2] == $(am__install_max)) \
--      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
--    END { for (dir in files) print dir, files[dir] }'
--am__base_list = \
--  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
--  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkglibdir)" \
- 	"$(DESTDIR)$(pkgincludedir)"
-+pkgconfigDATA_INSTALL = $(INSTALL_DATA)
-+pkglibDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(dist_noinst_DATA) $(pkgconfig_DATA) $(pkglib_DATA)
-+pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER)
- HEADERS = $(pkginclude_HEADERS)
- RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-   distclean-recursive maintainer-clean-recursive
--AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
--	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
--	distdir dist dist-all distcheck
- ETAGS = etags
- CTAGS = ctags
- 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)"; }; }
--am__relativize = \
--  dir0=`pwd`; \
--  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
--  sed_rest='s,^[^/]*/*,,'; \
--  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
--  sed_butlast='s,/*[^/]*$$,,'; \
--  while test -n "$$dir1"; do \
--    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
--    if test "$$first" != "."; then \
--      if test "$$first" = ".."; then \
--        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
--        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
--      else \
--        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
--        if test "$$first2" = "$$first"; then \
--          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
--        else \
--          dir2="../$$dir2"; \
--        fi; \
--        dir0="$$dir0"/"$$first"; \
--      fi; \
--    fi; \
--    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
--  done; \
--  reldir="$$dir2"
-+  { test ! -d $(distdir) \
-+    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-+         && rm -fr $(distdir); }; }
- DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
- GZIP_ENV = --best
- distuninstallcheck_listfiles = find . -type f -print
-@@ -224,6 +182,7 @@ VERSION = @VERSION@
- VGCONF_ARCH_PRI = @VGCONF_ARCH_PRI@
- VGCONF_ARCH_SEC = @VGCONF_ARCH_SEC@
- VGCONF_OS = @VGCONF_OS@
-+VGCONF_PLATFORM_ARM_ARCH = @VGCONF_PLATFORM_ARM_ARCH@
- VGCONF_PLATFORM_PRI_CAPS = @VGCONF_PLATFORM_PRI_CAPS@
- VGCONF_PLATFORM_SEC_CAPS = @VGCONF_PLATFORM_SEC_CAPS@
- VGCONF_PLATVARIANT = @VGCONF_PLATVARIANT@
-@@ -362,10 +321,10 @@ AM_CFLAGS_PPC64_LINUX = @FLAG_M64@ $(AM_
- AM_CCASFLAGS_PPC64_LINUX = $(AM_CPPFLAGS_PPC64_LINUX) @FLAG_M64@ -g
- AM_FLAG_M3264_ARM_LINUX = @FLAG_M32@
- AM_CFLAGS_ARM_LINUX = @FLAG_M32@ @PREFERRED_STACK_BOUNDARY@ \
--			 	$(AM_CFLAGS_BASE) -marm -mcpu=cortex-a8
-+			 	$(AM_CFLAGS_BASE) @VGCONF_PLATFORM_ARM_ARCH@
- 
- AM_CCASFLAGS_ARM_LINUX = $(AM_CPPFLAGS_ARM_LINUX) @FLAG_M32@ \
--				-marm -mcpu=cortex-a8 -g
-+				@VGCONF_PLATFORM_ARM_ARCH@ -g
- 
- AM_FLAG_M3264_X86_DARWIN = -arch i386
- AM_CFLAGS_X86_DARWIN = $(WERROR) -arch i386 $(AM_CFLAGS_BASE) \
-@@ -500,15 +459,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
--	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
-+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
-+	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
- 		&& exit 0; \
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
--	$(am__cd) $(top_srcdir) && \
--	  $(AUTOMAKE) --foreign Makefile
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- 	@case '$?' in \
-@@ -524,10 +483,9 @@ $(top_builddir)/config.status: $(top_src
- 	$(SHELL) ./config.status --recheck
- 
- $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
--	$(am__cd) $(srcdir) && $(AUTOCONF)
-+	cd $(srcdir) && $(AUTOCONF)
- $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
--	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
--$(am__aclocal_m4_deps):
-+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
- 
- config.h: stamp-h1
- 	@if test ! -f $@; then \
-@@ -539,7 +497,7 @@ stamp-h1: $(srcdir)/config.h.in $(top_bu
- 	@rm -f stamp-h1
- 	cd $(top_builddir) && $(SHELL) ./config.status config.h
- $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
--	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
-+	cd $(top_srcdir) && $(AUTOHEADER)
- 	rm -f stamp-h1
- 	touch $@
- 
-@@ -556,63 +514,54 @@ drd/scripts/download-and-build-splash2:
- install-pkgconfigDATA: $(pkgconfig_DATA)
- 	@$(NORMAL_INSTALL)
- 	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
--	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
--	for p in $$list; do \
-+	@list='$(pkgconfig_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--	  echo "$$d$$p"; \
--	done | $(am__base_list) | \
--	while read files; do \
--	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
--	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
-+	  f=$(am__strip_dir) \
-+	  echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
-+	  $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
- 	done
- 
- uninstall-pkgconfigDATA:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
--	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
--	test -n "$$files" || exit 0; \
--	echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
--	cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
-+	@list='$(pkgconfig_DATA)'; for p in $$list; do \
-+	  f=$(am__strip_dir) \
-+	  echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
-+	done
- install-pkglibDATA: $(pkglib_DATA)
- 	@$(NORMAL_INSTALL)
- 	test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
--	@list='$(pkglib_DATA)'; test -n "$(pkglibdir)" || list=; \
--	for p in $$list; do \
-+	@list='$(pkglib_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--	  echo "$$d$$p"; \
--	done | $(am__base_list) | \
--	while read files; do \
--	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkglibdir)'"; \
--	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkglibdir)" || exit $$?; \
-+	  f=$(am__strip_dir) \
-+	  echo " $(pkglibDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
-+	  $(pkglibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
- 	done
- 
- uninstall-pkglibDATA:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(pkglib_DATA)'; test -n "$(pkglibdir)" || list=; \
--	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
--	test -n "$$files" || exit 0; \
--	echo " ( cd '$(DESTDIR)$(pkglibdir)' && rm -f" $$files ")"; \
--	cd "$(DESTDIR)$(pkglibdir)" && rm -f $$files
-+	@list='$(pkglib_DATA)'; for p in $$list; do \
-+	  f=$(am__strip_dir) \
-+	  echo " rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
-+	done
- install-pkgincludeHEADERS: $(pkginclude_HEADERS)
- 	@$(NORMAL_INSTALL)
- 	test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)"
--	@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
--	for p in $$list; do \
-+	@list='$(pkginclude_HEADERS)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--	  echo "$$d$$p"; \
--	done | $(am__base_list) | \
--	while read files; do \
--	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \
--	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \
-+	  f=$(am__strip_dir) \
-+	  echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \
-+	  $(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \
- 	done
- 
- uninstall-pkgincludeHEADERS:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
--	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
--	test -n "$$files" || exit 0; \
--	echo " ( cd '$(DESTDIR)$(pkgincludedir)' && rm -f" $$files ")"; \
--	cd "$(DESTDIR)$(pkgincludedir)" && rm -f $$files
-+	@list='$(pkginclude_HEADERS)'; for p in $$list; do \
-+	  f=$(am__strip_dir) \
-+	  echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \
-+	done
- 
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
-@@ -638,7 +587,7 @@ $(RECURSIVE_TARGETS):
- 	  else \
- 	    local_target="$$target"; \
- 	  fi; \
--	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- 	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
-@@ -672,16 +621,16 @@ $(RECURSIVE_CLEAN_TARGETS):
- 	  else \
- 	    local_target="$$target"; \
- 	  fi; \
--	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- 	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
--	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- 	done
- ctags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
--	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- 	done
- 
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -696,7 +645,7 @@ tags: TAGS
- 
- TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
--	set x; \
-+	tags=; \
- 	here=`pwd`; \
- 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- 	  include_option=--etags-include; \
-@@ -708,7 +657,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
- 	    test ! -f $$subdir/TAGS || \
--	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- 	  fi; \
- 	done; \
- 	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-@@ -717,41 +666,36 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
- 	  done | \
- 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
--	shift; \
--	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- 	  test -n "$$unique" || unique=$$empty_fix; \
--	  if test $$# -gt 0; then \
--	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	      "$$@" $$unique; \
--	  else \
--	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	      $$unique; \
--	  fi; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
- 	fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
-+	tags=; \
- 	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \