patch-memcheck_perf_Makefile_in 7.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192
  1. --- valgrind-3.7.0.orig/memcheck/perf/Makefile.in 2011-11-05 12:26:53.000000000 +0100
  2. +++ valgrind-3.7.0/memcheck/perf/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. @@ -25,9 +25,8 @@
  9. #----------------------------------------------------------------------------
  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. @@ -54,14 +53,12 @@ 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. many_loss_records_SOURCES = many-loss-records.c
  25. many_loss_records_OBJECTS = many-loss-records.$(OBJEXT)
  26. many_loss_records_LDADD = $(LDADD)
  27. DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
  28. depcomp = $(SHELL) $(top_srcdir)/depcomp
  29. am__depfiles_maybe = depfiles
  30. -am__mv = mv -f
  31. COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  32. $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  33. CCLD = $(CC)
  34. @@ -153,6 +150,7 @@ VERSION = @VERSION@
  35. VGCONF_ARCH_PRI = @VGCONF_ARCH_PRI@
  36. VGCONF_ARCH_SEC = @VGCONF_ARCH_SEC@
  37. VGCONF_OS = @VGCONF_OS@
  38. +VGCONF_PLATFORM_ARM_ARCH = @VGCONF_PLATFORM_ARM_ARCH@
  39. VGCONF_PLATFORM_PRI_CAPS = @VGCONF_PLATFORM_PRI_CAPS@
  40. VGCONF_PLATFORM_SEC_CAPS = @VGCONF_PLATFORM_SEC_CAPS@
  41. VGCONF_PLATVARIANT = @VGCONF_PLATVARIANT@
  42. @@ -290,10 +288,10 @@ AM_CFLAGS_PPC64_LINUX = @FLAG_M64@ $(AM_
  43. AM_CCASFLAGS_PPC64_LINUX = $(AM_CPPFLAGS_PPC64_LINUX) @FLAG_M64@ -g
  44. AM_FLAG_M3264_ARM_LINUX = @FLAG_M32@
  45. AM_CFLAGS_ARM_LINUX = @FLAG_M32@ @PREFERRED_STACK_BOUNDARY@ \
  46. - $(AM_CFLAGS_BASE) -marm -mcpu=cortex-a8
  47. + $(AM_CFLAGS_BASE) @VGCONF_PLATFORM_ARM_ARCH@
  48. AM_CCASFLAGS_ARM_LINUX = $(AM_CPPFLAGS_ARM_LINUX) @FLAG_M32@ \
  49. - -marm -mcpu=cortex-a8 -g
  50. + @VGCONF_PLATFORM_ARM_ARCH@ -g
  51. AM_FLAG_M3264_X86_DARWIN = -arch i386
  52. AM_CFLAGS_X86_DARWIN = $(WERROR) -arch i386 $(AM_CFLAGS_BASE) \
  53. @@ -367,9 +365,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
  54. exit 1;; \
  55. esac; \
  56. done; \
  57. - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign memcheck/perf/Makefile'; \
  58. - $(am__cd) $(top_srcdir) && \
  59. - $(AUTOMAKE) --foreign memcheck/perf/Makefile
  60. + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign memcheck/perf/Makefile'; \
  61. + cd $(top_srcdir) && \
  62. + $(AUTOMAKE) --foreign memcheck/perf/Makefile
  63. .PRECIOUS: Makefile
  64. Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  65. @case '$?' in \
  66. @@ -387,7 +385,6 @@ $(top_srcdir)/configure: @MAINTAINER_MOD
  67. cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  68. $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  69. cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  70. -$(am__aclocal_m4_deps):
  71. clean-checkPROGRAMS:
  72. -test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS)
  73. @@ -405,14 +402,14 @@ distclean-compile:
  74. .c.o:
  75. @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
  76. -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  77. +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  78. @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  79. @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  80. @am__fastdepCC_FALSE@ $(COMPILE) -c $<
  81. .c.obj:
  82. @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
  83. -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  84. +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  85. @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  86. @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  87. @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
  88. @@ -429,7 +426,7 @@ tags: TAGS
  89. TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
  90. $(TAGS_FILES) $(LISP)
  91. - set x; \
  92. + tags=; \
  93. here=`pwd`; \
  94. list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  95. unique=`for i in $$list; do \
  96. @@ -437,34 +434,29 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP
  97. done | \
  98. $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
  99. END { if (nonempty) { for (i in files) print i; }; }'`; \
  100. - shift; \
  101. - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
  102. + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
  103. test -n "$$unique" || unique=$$empty_fix; \
  104. - if test $$# -gt 0; then \
  105. - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
  106. - "$$@" $$unique; \
  107. - else \
  108. - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
  109. - $$unique; \
  110. - fi; \
  111. + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
  112. + $$tags $$unique; \
  113. fi
  114. ctags: CTAGS
  115. CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
  116. $(TAGS_FILES) $(LISP)
  117. + tags=; \
  118. list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  119. unique=`for i in $$list; do \
  120. if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  121. done | \
  122. $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
  123. END { if (nonempty) { for (i in files) print i; }; }'`; \
  124. - test -z "$(CTAGS_ARGS)$$unique" \
  125. + test -z "$(CTAGS_ARGS)$$tags$$unique" \
  126. || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
  127. - $$unique
  128. + $$tags $$unique
  129. GTAGS:
  130. here=`$(am__cd) $(top_builddir) && pwd` \
  131. - && $(am__cd) $(top_srcdir) \
  132. - && gtags -i $(GTAGS_ARGS) "$$here"
  133. + && cd $(top_srcdir) \
  134. + && gtags -i $(GTAGS_ARGS) $$here
  135. distclean-tags:
  136. -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  137. @@ -485,17 +477,13 @@ distdir: $(DISTFILES)
  138. if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
  139. if test -d $$d/$$file; then \
  140. dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
  141. - if test -d "$(distdir)/$$file"; then \
  142. - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
  143. - fi; \
  144. if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
  145. - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
  146. - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
  147. + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
  148. fi; \
  149. - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
  150. + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
  151. else \
  152. - test -f "$(distdir)/$$file" \
  153. - || cp -p $$d/$$file "$(distdir)/$$file" \
  154. + test -f $(distdir)/$$file \
  155. + || cp -p $$d/$$file $(distdir)/$$file \
  156. || exit 1; \
  157. fi; \
  158. done
  159. @@ -525,7 +513,6 @@ clean-generic:
  160. distclean-generic:
  161. -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
  162. - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
  163. maintainer-clean-generic:
  164. @echo "This command is intended for maintainers to use"
  165. @@ -599,7 +586,7 @@ ps-am:
  166. uninstall-am:
  167. -.MAKE: check-am install-am install-strip
  168. +.MAKE: install-am install-strip
  169. .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \
  170. clean-checkPROGRAMS clean-generic clean-local ctags distclean \
  171. @@ -683,7 +670,6 @@ clean-noinst_DSYMS:
  172. check-local: build-noinst_DSYMS
  173. clean-local: clean-noinst_DSYMS
  174. -
  175. # Tell versions [3.59,3.63) of GNU make to not export all variables.
  176. # Otherwise a system limit (for SysV at least) may be exceeded.
  177. .NOEXPORT: