diff options
Diffstat (limited to 'package/valgrind/patches/patch-exp-dhat_Makefile_in')
| -rw-r--r-- | package/valgrind/patches/patch-exp-dhat_Makefile_in | 337 |
1 files changed, 337 insertions, 0 deletions
diff --git a/package/valgrind/patches/patch-exp-dhat_Makefile_in b/package/valgrind/patches/patch-exp-dhat_Makefile_in new file mode 100644 index 000000000..9ea3a3e91 --- /dev/null +++ b/package/valgrind/patches/patch-exp-dhat_Makefile_in @@ -0,0 +1,337 @@ +--- valgrind-3.7.0.orig/exp-dhat/Makefile.in 2011-11-05 12:26:51.000000000 +0100 ++++ valgrind-3.7.0/exp-dhat/Makefile.in 2013-07-23 12:27:53.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, +@@ -24,9 +24,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 +@@ -61,7 +60,6 @@ am__configure_deps = $(am__aclocal_m4_de + mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = +-CONFIG_CLEAN_VPATH_FILES = + @VGCONF_HAVE_PLATFORM_SEC_TRUE@am__EXEEXT_1 = exp-dhat-@VGCONF_ARCH_SEC@-@VGCONF_OS@$(EXEEXT) + @VGCONF_HAVE_PLATFORM_SEC_TRUE@am__EXEEXT_2 = vgpreload_exp-dhat-@VGCONF_ARCH_SEC@-@VGCONF_OS@.so$(EXEEXT) + PROGRAMS = $(noinst_PROGRAMS) +@@ -96,7 +94,6 @@ vgpreload_exp_dhat_@VGCONF_ARCH_SEC@_@VG + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +-am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +@@ -118,38 +115,10 @@ RECURSIVE_TARGETS = all-recursive check- + ps-recursive uninstall-recursive + 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 + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-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" + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + AR = @AR@ +@@ -232,6 +201,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@ +@@ -370,10 +340,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) \ +@@ -636,9 +606,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign exp-dhat/Makefile'; \ +- $(am__cd) $(top_srcdir) && \ +- $(AUTOMAKE) --foreign exp-dhat/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign exp-dhat/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --foreign exp-dhat/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -656,7 +626,6 @@ $(top_srcdir)/configure: @MAINTAINER_MOD + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(am__aclocal_m4_deps): + + clean-noinstPROGRAMS: + -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) +@@ -684,42 +653,42 @@ distclean-compile: + + .c.o: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + exp_dhat_@VGCONF_ARCH_PRI@_@VGCONF_OS@-dh_main.o: dh_main.c + @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(exp_dhat_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CPPFLAGS) $(CPPFLAGS) $(exp_dhat_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS) $(CFLAGS) -MT exp_dhat_@VGCONF_ARCH_PRI@_@VGCONF_OS@-dh_main.o -MD -MP -MF $(DEPDIR)/exp_dhat_@VGCONF_ARCH_PRI@_@VGCONF_OS@-dh_main.Tpo -c -o exp_dhat_@VGCONF_ARCH_PRI@_@VGCONF_OS@-dh_main.o `test -f 'dh_main.c' || echo '$(srcdir)/'`dh_main.c +-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/exp_dhat_@VGCONF_ARCH_PRI@_@VGCONF_OS@-dh_main.Tpo $(DEPDIR)/exp_dhat_@VGCONF_ARCH_PRI@_@VGCONF_OS@-dh_main.Po ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/exp_dhat_@VGCONF_ARCH_PRI@_@VGCONF_OS@-dh_main.Tpo $(DEPDIR)/exp_dhat_@VGCONF_ARCH_PRI@_@VGCONF_OS@-dh_main.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dh_main.c' object='exp_dhat_@VGCONF_ARCH_PRI@_@VGCONF_OS@-dh_main.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(exp_dhat_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CPPFLAGS) $(CPPFLAGS) $(exp_dhat_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS) $(CFLAGS) -c -o exp_dhat_@VGCONF_ARCH_PRI@_@VGCONF_OS@-dh_main.o `test -f 'dh_main.c' || echo '$(srcdir)/'`dh_main.c + + exp_dhat_@VGCONF_ARCH_PRI@_@VGCONF_OS@-dh_main.obj: dh_main.c + @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(exp_dhat_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CPPFLAGS) $(CPPFLAGS) $(exp_dhat_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS) $(CFLAGS) -MT exp_dhat_@VGCONF_ARCH_PRI@_@VGCONF_OS@-dh_main.obj -MD -MP -MF $(DEPDIR)/exp_dhat_@VGCONF_ARCH_PRI@_@VGCONF_OS@-dh_main.Tpo -c -o exp_dhat_@VGCONF_ARCH_PRI@_@VGCONF_OS@-dh_main.obj `if test -f 'dh_main.c'; then $(CYGPATH_W) 'dh_main.c'; else $(CYGPATH_W) '$(srcdir)/dh_main.c'; fi` +-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/exp_dhat_@VGCONF_ARCH_PRI@_@VGCONF_OS@-dh_main.Tpo $(DEPDIR)/exp_dhat_@VGCONF_ARCH_PRI@_@VGCONF_OS@-dh_main.Po ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/exp_dhat_@VGCONF_ARCH_PRI@_@VGCONF_OS@-dh_main.Tpo $(DEPDIR)/exp_dhat_@VGCONF_ARCH_PRI@_@VGCONF_OS@-dh_main.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dh_main.c' object='exp_dhat_@VGCONF_ARCH_PRI@_@VGCONF_OS@-dh_main.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(exp_dhat_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CPPFLAGS) $(CPPFLAGS) $(exp_dhat_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS) $(CFLAGS) -c -o exp_dhat_@VGCONF_ARCH_PRI@_@VGCONF_OS@-dh_main.obj `if test -f 'dh_main.c'; then $(CYGPATH_W) 'dh_main.c'; else $(CYGPATH_W) '$(srcdir)/dh_main.c'; fi` + + exp_dhat_@VGCONF_ARCH_SEC@_@VGCONF_OS@-dh_main.o: dh_main.c + @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(exp_dhat_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CPPFLAGS) $(CPPFLAGS) $(exp_dhat_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS) $(CFLAGS) -MT exp_dhat_@VGCONF_ARCH_SEC@_@VGCONF_OS@-dh_main.o -MD -MP -MF $(DEPDIR)/exp_dhat_@VGCONF_ARCH_SEC@_@VGCONF_OS@-dh_main.Tpo -c -o exp_dhat_@VGCONF_ARCH_SEC@_@VGCONF_OS@-dh_main.o `test -f 'dh_main.c' || echo '$(srcdir)/'`dh_main.c +-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/exp_dhat_@VGCONF_ARCH_SEC@_@VGCONF_OS@-dh_main.Tpo $(DEPDIR)/exp_dhat_@VGCONF_ARCH_SEC@_@VGCONF_OS@-dh_main.Po ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/exp_dhat_@VGCONF_ARCH_SEC@_@VGCONF_OS@-dh_main.Tpo $(DEPDIR)/exp_dhat_@VGCONF_ARCH_SEC@_@VGCONF_OS@-dh_main.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dh_main.c' object='exp_dhat_@VGCONF_ARCH_SEC@_@VGCONF_OS@-dh_main.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(exp_dhat_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CPPFLAGS) $(CPPFLAGS) $(exp_dhat_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS) $(CFLAGS) -c -o exp_dhat_@VGCONF_ARCH_SEC@_@VGCONF_OS@-dh_main.o `test -f 'dh_main.c' || echo '$(srcdir)/'`dh_main.c + + exp_dhat_@VGCONF_ARCH_SEC@_@VGCONF_OS@-dh_main.obj: dh_main.c + @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(exp_dhat_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CPPFLAGS) $(CPPFLAGS) $(exp_dhat_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS) $(CFLAGS) -MT exp_dhat_@VGCONF_ARCH_SEC@_@VGCONF_OS@-dh_main.obj -MD -MP -MF $(DEPDIR)/exp_dhat_@VGCONF_ARCH_SEC@_@VGCONF_OS@-dh_main.Tpo -c -o exp_dhat_@VGCONF_ARCH_SEC@_@VGCONF_OS@-dh_main.obj `if test -f 'dh_main.c'; then $(CYGPATH_W) 'dh_main.c'; else $(CYGPATH_W) '$(srcdir)/dh_main.c'; fi` +-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/exp_dhat_@VGCONF_ARCH_SEC@_@VGCONF_OS@-dh_main.Tpo $(DEPDIR)/exp_dhat_@VGCONF_ARCH_SEC@_@VGCONF_OS@-dh_main.Po ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/exp_dhat_@VGCONF_ARCH_SEC@_@VGCONF_OS@-dh_main.Tpo $(DEPDIR)/exp_dhat_@VGCONF_ARCH_SEC@_@VGCONF_OS@-dh_main.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dh_main.c' object='exp_dhat_@VGCONF_ARCH_SEC@_@VGCONF_OS@-dh_main.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(exp_dhat_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CPPFLAGS) $(CPPFLAGS) $(exp_dhat_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS) $(CFLAGS) -c -o exp_dhat_@VGCONF_ARCH_SEC@_@VGCONF_OS@-dh_main.obj `if test -f 'dh_main.c'; then $(CYGPATH_W) 'dh_main.c'; else $(CYGPATH_W) '$(srcdir)/dh_main.c'; fi` +@@ -748,7 +717,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 \ +@@ -782,16 +751,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) +@@ -806,7 +775,7 @@ tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- set x; \ ++ tags=; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +@@ -818,7 +787,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) $(LISP) $(TAGS_FILES)'; \ +@@ -827,34 +796,29 @@ 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) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) ++ tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- test -z "$(CTAGS_ARGS)$$unique" \ ++ test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$unique ++ $$tags $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && $(am__cd) $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) "$$here" ++ && cd $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) $$here + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@@ -875,44 +839,29 @@ distdir: $(DISTFILES) + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ +- $(am__relativize); \ +- new_distdir=$$reldir; \ +- dir1=$$subdir; dir2="$(top_distdir)"; \ +- $(am__relativize); \ +- new_top_distdir=$$reldir; \ +- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ +- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ +- ($(am__cd) $$subdir && \ ++ distdir=`$(am__cd) $(distdir) && pwd`; \ ++ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ ++ (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$new_top_distdir" \ +- distdir="$$new_distdir" \ ++ top_distdir="$$top_distdir" \ ++ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ +- am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -942,7 +891,6 @@ clean-generic: + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -1017,8 +965,8 @@ ps-am: + + uninstall-am: + +-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ +- install-am install-strip tags-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip + + .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am all-local check check-am clean clean-generic \ +@@ -1110,7 +1058,6 @@ all-local: inplace-noinst_PROGRAMS inpla + clean-local: clean-noinst_DSYMS + + install-exec-local: install-noinst_PROGRAMS install-noinst_DSYMS +- + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: |