patch-include_Makefile_in 8.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207
  1. --- valgrind-3.7.0.orig/include/Makefile.in 2011-11-05 12:26:52.000000000 +0100
  2. +++ valgrind-3.7.0/include/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. @@ -17,9 +17,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. @@ -44,7 +43,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. SOURCES =
  24. DIST_SOURCES =
  25. am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
  26. @@ -52,23 +50,9 @@ am__vpath_adj = case $$p in \
  27. $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
  28. *) f=$$p;; \
  29. esac;
  30. -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
  31. -am__install_max = 40
  32. -am__nobase_strip_setup = \
  33. - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
  34. -am__nobase_strip = \
  35. - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
  36. -am__nobase_list = $(am__nobase_strip_setup); \
  37. - for p in $$list; do echo "$$p $$p"; done | \
  38. - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
  39. - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
  40. - if (++n[$$2] == $(am__install_max)) \
  41. - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
  42. - END { for (dir in files) print dir, files[dir] }'
  43. -am__base_list = \
  44. - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
  45. - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
  46. +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
  47. am__installdirs = "$(DESTDIR)$(pkgincludedir)"
  48. +nobase_pkgincludeHEADERS_INSTALL = $(install_sh_DATA)
  49. HEADERS = $(nobase_pkginclude_HEADERS)
  50. ETAGS = etags
  51. CTAGS = ctags
  52. @@ -155,6 +139,7 @@ VERSION = @VERSION@
  53. VGCONF_ARCH_PRI = @VGCONF_ARCH_PRI@
  54. VGCONF_ARCH_SEC = @VGCONF_ARCH_SEC@
  55. VGCONF_OS = @VGCONF_OS@
  56. +VGCONF_PLATFORM_ARM_ARCH = @VGCONF_PLATFORM_ARM_ARCH@
  57. VGCONF_PLATFORM_PRI_CAPS = @VGCONF_PLATFORM_PRI_CAPS@
  58. VGCONF_PLATFORM_SEC_CAPS = @VGCONF_PLATFORM_SEC_CAPS@
  59. VGCONF_PLATVARIANT = @VGCONF_PLATVARIANT@
  60. @@ -284,9 +269,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
  61. exit 1;; \
  62. esac; \
  63. done; \
  64. - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/Makefile'; \
  65. - $(am__cd) $(top_srcdir) && \
  66. - $(AUTOMAKE) --foreign include/Makefile
  67. + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/Makefile'; \
  68. + cd $(top_srcdir) && \
  69. + $(AUTOMAKE) --foreign include/Makefile
  70. .PRECIOUS: Makefile
  71. Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  72. @case '$?' in \
  73. @@ -304,30 +289,25 @@ $(top_srcdir)/configure: @MAINTAINER_MOD
  74. cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  75. $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  76. cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  77. -$(am__aclocal_m4_deps):
  78. install-nobase_pkgincludeHEADERS: $(nobase_pkginclude_HEADERS)
  79. @$(NORMAL_INSTALL)
  80. test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)"
  81. - @list='$(nobase_pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
  82. - $(am__nobase_list) | while read dir files; do \
  83. - xfiles=; for file in $$files; do \
  84. - if test -f "$$file"; then xfiles="$$xfiles $$file"; \
  85. - else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
  86. - test -z "$$xfiles" || { \
  87. - test "x$$dir" = x. || { \
  88. - echo "$(MKDIR_P) '$(DESTDIR)$(pkgincludedir)/$$dir'"; \
  89. - $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)/$$dir"; }; \
  90. - echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(pkgincludedir)/$$dir'"; \
  91. - $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(pkgincludedir)/$$dir" || exit $$?; }; \
  92. + @$(am__vpath_adj_setup) \
  93. + list='$(nobase_pkginclude_HEADERS)'; for p in $$list; do \
  94. + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
  95. + $(am__vpath_adj) \
  96. + echo " $(nobase_pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \
  97. + $(nobase_pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \
  98. done
  99. uninstall-nobase_pkgincludeHEADERS:
  100. @$(NORMAL_UNINSTALL)
  101. - @list='$(nobase_pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
  102. - $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
  103. - test -n "$$files" || exit 0; \
  104. - echo " ( cd '$(DESTDIR)$(pkgincludedir)' && rm -f" $$files ")"; \
  105. - cd "$(DESTDIR)$(pkgincludedir)" && rm -f $$files
  106. + @$(am__vpath_adj_setup) \
  107. + list='$(nobase_pkginclude_HEADERS)'; for p in $$list; do \
  108. + $(am__vpath_adj) \
  109. + echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \
  110. + rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \
  111. + done
  112. ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  113. list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  114. @@ -341,7 +321,7 @@ tags: TAGS
  115. TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
  116. $(TAGS_FILES) $(LISP)
  117. - set x; \
  118. + tags=; \
  119. here=`pwd`; \
  120. list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  121. unique=`for i in $$list; do \
  122. @@ -349,34 +329,29 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP
  123. done | \
  124. $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
  125. END { if (nonempty) { for (i in files) print i; }; }'`; \
  126. - shift; \
  127. - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
  128. + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
  129. test -n "$$unique" || unique=$$empty_fix; \
  130. - if test $$# -gt 0; then \
  131. - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
  132. - "$$@" $$unique; \
  133. - else \
  134. - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
  135. - $$unique; \
  136. - fi; \
  137. + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
  138. + $$tags $$unique; \
  139. fi
  140. ctags: CTAGS
  141. CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
  142. $(TAGS_FILES) $(LISP)
  143. + tags=; \
  144. list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  145. unique=`for i in $$list; do \
  146. if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  147. done | \
  148. $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
  149. END { if (nonempty) { for (i in files) print i; }; }'`; \
  150. - test -z "$(CTAGS_ARGS)$$unique" \
  151. + test -z "$(CTAGS_ARGS)$$tags$$unique" \
  152. || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
  153. - $$unique
  154. + $$tags $$unique
  155. GTAGS:
  156. here=`$(am__cd) $(top_builddir) && pwd` \
  157. - && $(am__cd) $(top_srcdir) \
  158. - && gtags -i $(GTAGS_ARGS) "$$here"
  159. + && cd $(top_srcdir) \
  160. + && gtags -i $(GTAGS_ARGS) $$here
  161. distclean-tags:
  162. -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  163. @@ -397,17 +372,13 @@ distdir: $(DISTFILES)
  164. if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
  165. if test -d $$d/$$file; then \
  166. dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
  167. - if test -d "$(distdir)/$$file"; then \
  168. - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
  169. - fi; \
  170. if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
  171. - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
  172. - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
  173. + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
  174. fi; \
  175. - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
  176. + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
  177. else \
  178. - test -f "$(distdir)/$$file" \
  179. - || cp -p $$d/$$file "$(distdir)/$$file" \
  180. + test -f $(distdir)/$$file \
  181. + || cp -p $$d/$$file $(distdir)/$$file \
  182. || exit 1; \
  183. fi; \
  184. done
  185. @@ -438,7 +409,6 @@ clean-generic:
  186. distclean-generic:
  187. -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
  188. - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
  189. maintainer-clean-generic:
  190. @echo "This command is intended for maintainers to use"
  191. @@ -524,7 +494,6 @@ uninstall-am: uninstall-nobase_pkginclud
  192. pdf-am ps ps-am tags uninstall uninstall-am \
  193. uninstall-nobase_pkgincludeHEADERS
  194. -
  195. # Tell versions [3.59,3.63) of GNU make to not export all variables.
  196. # Otherwise a system limit (for SysV at least) may be exceeded.
  197. .NOEXPORT: