patch-exp-bbv_tests_Makefile_in 10 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279
  1. --- valgrind-3.7.0.orig/exp-bbv/tests/Makefile.in 2011-11-05 12:26:51.000000000 +0100
  2. +++ valgrind-3.7.0/exp-bbv/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. @@ -26,9 +26,8 @@
  9. VPATH = @srcdir@
  10. pkgdatadir = $(datadir)/@PACKAGE@
  11. -pkgincludedir = $(includedir)/@PACKAGE@
  12. pkglibdir = $(libdir)/@PACKAGE@
  13. -pkglibexecdir = $(libexecdir)/@PACKAGE@
  14. +pkgincludedir = $(includedir)/@PACKAGE@
  15. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  16. install_sh_DATA = $(install_sh) -c -m 644
  17. install_sh_PROGRAM = $(install_sh) -c
  18. @@ -62,7 +61,6 @@ am__configure_deps = $(am__aclocal_m4_de
  19. mkinstalldirs = $(install_sh) -d
  20. CONFIG_HEADER = $(top_builddir)/config.h
  21. CONFIG_CLEAN_FILES =
  22. -CONFIG_CLEAN_VPATH_FILES =
  23. SCRIPTS = $(dist_noinst_SCRIPTS)
  24. SOURCES =
  25. DIST_SOURCES =
  26. @@ -75,37 +73,9 @@ RECURSIVE_TARGETS = all-recursive check-
  27. ps-recursive uninstall-recursive
  28. RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
  29. distclean-recursive maintainer-clean-recursive
  30. -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
  31. - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
  32. - distdir
  33. ETAGS = etags
  34. CTAGS = ctags
  35. DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  36. -am__relativize = \
  37. - dir0=`pwd`; \
  38. - sed_first='s,^\([^/]*\)/.*$$,\1,'; \
  39. - sed_rest='s,^[^/]*/*,,'; \
  40. - sed_last='s,^.*/\([^/]*\)$$,\1,'; \
  41. - sed_butlast='s,/*[^/]*$$,,'; \
  42. - while test -n "$$dir1"; do \
  43. - first=`echo "$$dir1" | sed -e "$$sed_first"`; \
  44. - if test "$$first" != "."; then \
  45. - if test "$$first" = ".."; then \
  46. - dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
  47. - dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
  48. - else \
  49. - first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
  50. - if test "$$first2" = "$$first"; then \
  51. - dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
  52. - else \
  53. - dir2="../$$dir2"; \
  54. - fi; \
  55. - dir0="$$dir0"/"$$first"; \
  56. - fi; \
  57. - fi; \
  58. - dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
  59. - done; \
  60. - reldir="$$dir2"
  61. ACLOCAL = @ACLOCAL@
  62. AMTAR = @AMTAR@
  63. AR = @AR@
  64. @@ -188,6 +158,7 @@ VERSION = @VERSION@
  65. VGCONF_ARCH_PRI = @VGCONF_ARCH_PRI@
  66. VGCONF_ARCH_SEC = @VGCONF_ARCH_SEC@
  67. VGCONF_OS = @VGCONF_OS@
  68. +VGCONF_PLATFORM_ARM_ARCH = @VGCONF_PLATFORM_ARM_ARCH@
  69. VGCONF_PLATFORM_PRI_CAPS = @VGCONF_PLATFORM_PRI_CAPS@
  70. VGCONF_PLATFORM_SEC_CAPS = @VGCONF_PLATFORM_SEC_CAPS@
  71. VGCONF_PLATVARIANT = @VGCONF_PLATVARIANT@
  72. @@ -325,10 +296,10 @@ AM_CFLAGS_PPC64_LINUX = @FLAG_M64@ $(AM_
  73. AM_CCASFLAGS_PPC64_LINUX = $(AM_CPPFLAGS_PPC64_LINUX) @FLAG_M64@ -g
  74. AM_FLAG_M3264_ARM_LINUX = @FLAG_M32@
  75. AM_CFLAGS_ARM_LINUX = @FLAG_M32@ @PREFERRED_STACK_BOUNDARY@ \
  76. - $(AM_CFLAGS_BASE) -marm -mcpu=cortex-a8
  77. + $(AM_CFLAGS_BASE) @VGCONF_PLATFORM_ARM_ARCH@
  78. AM_CCASFLAGS_ARM_LINUX = $(AM_CPPFLAGS_ARM_LINUX) @FLAG_M32@ \
  79. - -marm -mcpu=cortex-a8 -g
  80. + @VGCONF_PLATFORM_ARM_ARCH@ -g
  81. AM_FLAG_M3264_X86_DARWIN = -arch i386
  82. AM_CFLAGS_X86_DARWIN = $(WERROR) -arch i386 $(AM_CFLAGS_BASE) \
  83. @@ -408,9 +379,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
  84. exit 1;; \
  85. esac; \
  86. done; \
  87. - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign exp-bbv/tests/Makefile'; \
  88. - $(am__cd) $(top_srcdir) && \
  89. - $(AUTOMAKE) --foreign exp-bbv/tests/Makefile
  90. + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign exp-bbv/tests/Makefile'; \
  91. + cd $(top_srcdir) && \
  92. + $(AUTOMAKE) --foreign exp-bbv/tests/Makefile
  93. .PRECIOUS: Makefile
  94. Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  95. @case '$?' in \
  96. @@ -428,7 +399,6 @@ $(top_srcdir)/configure: @MAINTAINER_MOD
  97. cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  98. $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  99. cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  100. -$(am__aclocal_m4_deps):
  101. clean-checkPROGRAMS:
  102. -test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS)
  103. @@ -457,7 +427,7 @@ $(RECURSIVE_TARGETS):
  104. else \
  105. local_target="$$target"; \
  106. fi; \
  107. - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
  108. + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
  109. || eval $$failcom; \
  110. done; \
  111. if test "$$dot_seen" = "no"; then \
  112. @@ -491,16 +461,16 @@ $(RECURSIVE_CLEAN_TARGETS):
  113. else \
  114. local_target="$$target"; \
  115. fi; \
  116. - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
  117. + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
  118. || eval $$failcom; \
  119. done && test -z "$$fail"
  120. tags-recursive:
  121. list='$(SUBDIRS)'; for subdir in $$list; do \
  122. - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
  123. + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
  124. done
  125. ctags-recursive:
  126. list='$(SUBDIRS)'; for subdir in $$list; do \
  127. - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  128. + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  129. done
  130. ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  131. @@ -515,7 +485,7 @@ tags: TAGS
  132. TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
  133. $(TAGS_FILES) $(LISP)
  134. - set x; \
  135. + tags=; \
  136. here=`pwd`; \
  137. if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
  138. include_option=--etags-include; \
  139. @@ -527,7 +497,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
  140. list='$(SUBDIRS)'; for subdir in $$list; do \
  141. if test "$$subdir" = .; then :; else \
  142. test ! -f $$subdir/TAGS || \
  143. - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
  144. + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  145. fi; \
  146. done; \
  147. list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  148. @@ -536,34 +506,29 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
  149. done | \
  150. $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
  151. END { if (nonempty) { for (i in files) print i; }; }'`; \
  152. - shift; \
  153. - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
  154. + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
  155. test -n "$$unique" || unique=$$empty_fix; \
  156. - if test $$# -gt 0; then \
  157. - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
  158. - "$$@" $$unique; \
  159. - else \
  160. - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
  161. - $$unique; \
  162. - fi; \
  163. + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
  164. + $$tags $$unique; \
  165. fi
  166. ctags: CTAGS
  167. CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
  168. $(TAGS_FILES) $(LISP)
  169. + tags=; \
  170. list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  171. unique=`for i in $$list; do \
  172. if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  173. done | \
  174. $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
  175. END { if (nonempty) { for (i in files) print i; }; }'`; \
  176. - test -z "$(CTAGS_ARGS)$$unique" \
  177. + test -z "$(CTAGS_ARGS)$$tags$$unique" \
  178. || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
  179. - $$unique
  180. + $$tags $$unique
  181. GTAGS:
  182. here=`$(am__cd) $(top_builddir) && pwd` \
  183. - && $(am__cd) $(top_srcdir) \
  184. - && gtags -i $(GTAGS_ARGS) "$$here"
  185. + && cd $(top_srcdir) \
  186. + && gtags -i $(GTAGS_ARGS) $$here
  187. distclean-tags:
  188. -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  189. @@ -584,44 +549,29 @@ distdir: $(DISTFILES)
  190. if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
  191. if test -d $$d/$$file; then \
  192. dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
  193. - if test -d "$(distdir)/$$file"; then \
  194. - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
  195. - fi; \
  196. if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
  197. - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
  198. - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
  199. + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
  200. fi; \
  201. - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
  202. + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
  203. else \
  204. - test -f "$(distdir)/$$file" \
  205. - || cp -p $$d/$$file "$(distdir)/$$file" \
  206. + test -f $(distdir)/$$file \
  207. + || cp -p $$d/$$file $(distdir)/$$file \
  208. || exit 1; \
  209. fi; \
  210. done
  211. - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
  212. + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
  213. if test "$$subdir" = .; then :; else \
  214. test -d "$(distdir)/$$subdir" \
  215. || $(MKDIR_P) "$(distdir)/$$subdir" \
  216. || exit 1; \
  217. - fi; \
  218. - done
  219. - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
  220. - if test "$$subdir" = .; then :; else \
  221. - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
  222. - $(am__relativize); \
  223. - new_distdir=$$reldir; \
  224. - dir1=$$subdir; dir2="$(top_distdir)"; \
  225. - $(am__relativize); \
  226. - new_top_distdir=$$reldir; \
  227. - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
  228. - echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
  229. - ($(am__cd) $$subdir && \
  230. + distdir=`$(am__cd) $(distdir) && pwd`; \
  231. + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
  232. + (cd $$subdir && \
  233. $(MAKE) $(AM_MAKEFLAGS) \
  234. - top_distdir="$$new_top_distdir" \
  235. - distdir="$$new_distdir" \
  236. + top_distdir="$$top_distdir" \
  237. + distdir="$$distdir/$$subdir" \
  238. am__remove_distdir=: \
  239. am__skip_length_check=: \
  240. - am__skip_mode_fix=: \
  241. distdir) \
  242. || exit 1; \
  243. fi; \
  244. @@ -653,7 +603,6 @@ clean-generic:
  245. distclean-generic:
  246. -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
  247. - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
  248. maintainer-clean-generic:
  249. @echo "This command is intended for maintainers to use"
  250. @@ -724,8 +673,8 @@ ps-am:
  251. uninstall-am:
  252. -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \
  253. - ctags-recursive install-am install-strip tags-recursive
  254. +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
  255. + install-strip
  256. .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
  257. all all-am check check-am check-local clean \
  258. @@ -810,7 +759,6 @@ clean-noinst_DSYMS:
  259. check-local: build-noinst_DSYMS
  260. clean-local: clean-noinst_DSYMS
  261. -
  262. # Tell versions [3.59,3.63) of GNU make to not export all variables.
  263. # Otherwise a system limit (for SysV at least) may be exceeded.
  264. .NOEXPORT: