patch-exp-dhat_tests_Makefile_in 3.7 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394
  1. --- valgrind-3.7.0.orig/exp-dhat/tests/Makefile.in 2011-11-05 12:26:51.000000000 +0100
  2. +++ valgrind-3.7.0/exp-dhat/tests/Makefile.in 2013-07-23 12:27:53.000000000 +0200
  3. @@ -1,4 +1,4 @@
  4. -# Makefile.in generated by automake 1.11.1 from Makefile.am.
  5. +# Makefile.in generated by automake 1.10.3 from Makefile.am.
  6. # @configure_input@
  7. # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
  8. @@ -16,9 +16,8 @@
  9. @SET_MAKE@
  10. VPATH = @srcdir@
  11. pkgdatadir = $(datadir)/@PACKAGE@
  12. -pkgincludedir = $(includedir)/@PACKAGE@
  13. pkglibdir = $(libdir)/@PACKAGE@
  14. -pkglibexecdir = $(libexecdir)/@PACKAGE@
  15. +pkgincludedir = $(includedir)/@PACKAGE@
  16. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  17. install_sh_DATA = $(install_sh) -c -m 644
  18. install_sh_PROGRAM = $(install_sh) -c
  19. @@ -42,7 +41,6 @@ am__configure_deps = $(am__aclocal_m4_de
  20. mkinstalldirs = $(install_sh) -d
  21. CONFIG_HEADER = $(top_builddir)/config.h
  22. CONFIG_CLEAN_FILES =
  23. -CONFIG_CLEAN_VPATH_FILES =
  24. SOURCES =
  25. DIST_SOURCES =
  26. DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  27. @@ -128,6 +126,7 @@ VERSION = @VERSION@
  28. VGCONF_ARCH_PRI = @VGCONF_ARCH_PRI@
  29. VGCONF_ARCH_SEC = @VGCONF_ARCH_SEC@
  30. VGCONF_OS = @VGCONF_OS@
  31. +VGCONF_PLATFORM_ARM_ARCH = @VGCONF_PLATFORM_ARM_ARCH@
  32. VGCONF_PLATFORM_PRI_CAPS = @VGCONF_PLATFORM_PRI_CAPS@
  33. VGCONF_PLATFORM_SEC_CAPS = @VGCONF_PLATFORM_SEC_CAPS@
  34. VGCONF_PLATVARIANT = @VGCONF_PLATVARIANT@
  35. @@ -194,9 +193,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
  36. exit 1;; \
  37. esac; \
  38. done; \
  39. - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign exp-dhat/tests/Makefile'; \
  40. - $(am__cd) $(top_srcdir) && \
  41. - $(AUTOMAKE) --foreign exp-dhat/tests/Makefile
  42. + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign exp-dhat/tests/Makefile'; \
  43. + cd $(top_srcdir) && \
  44. + $(AUTOMAKE) --foreign exp-dhat/tests/Makefile
  45. .PRECIOUS: Makefile
  46. Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  47. @case '$?' in \
  48. @@ -214,7 +213,6 @@ $(top_srcdir)/configure: @MAINTAINER_MOD
  49. cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  50. $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  51. cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  52. -$(am__aclocal_m4_deps):
  53. tags: TAGS
  54. TAGS:
  55. @@ -238,17 +236,13 @@ distdir: $(DISTFILES)
  56. if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
  57. if test -d $$d/$$file; then \
  58. dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
  59. - if test -d "$(distdir)/$$file"; then \
  60. - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
  61. - fi; \
  62. if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
  63. - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
  64. - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
  65. + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
  66. fi; \
  67. - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
  68. + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
  69. else \
  70. - test -f "$(distdir)/$$file" \
  71. - || cp -p $$d/$$file "$(distdir)/$$file" \
  72. + test -f $(distdir)/$$file \
  73. + || cp -p $$d/$$file $(distdir)/$$file \
  74. || exit 1; \
  75. fi; \
  76. done
  77. @@ -276,7 +270,6 @@ clean-generic:
  78. distclean-generic:
  79. -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
  80. - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
  81. maintainer-clean-generic:
  82. @echo "This command is intended for maintainers to use"
  83. @@ -359,7 +352,6 @@ uninstall-am:
  84. maintainer-clean maintainer-clean-generic mostlyclean \
  85. mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
  86. -
  87. # Tell versions [3.59,3.63) of GNU make to not export all variables.
  88. # Otherwise a system limit (for SysV at least) may be exceeded.
  89. .NOEXPORT: