CoinMP-build.diff 6.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155
  1. diff -ur CoinMP-1.8.3.orig/Cbc/Makefile.am CoinMP-1.8.3/Cbc/Makefile.am
  2. --- CoinMP-1.8.3.orig/Cbc/Makefile.am 2015-02-07 11:56:19.000000000 -0800
  3. +++ CoinMP-1.8.3/Cbc/Makefile.am 2018-06-25 08:31:55.590319068 -0700
  4. @@ -158,4 +158,4 @@
  5. # Files that are generated and should be cleaned with make distclean
  6. DISTCLEANFILES =
  7. -include BuildTools/Makemain.inc
  8. +include ../BuildTools/Makemain.inc
  9. diff -ur CoinMP-1.8.3.orig/Cbc/configure.ac CoinMP-1.8.3/Cbc/configure.ac
  10. --- CoinMP-1.8.3.orig/Cbc/configure.ac 2015-09-22 09:20:00.000000000 -0700
  11. +++ CoinMP-1.8.3/Cbc/configure.ac 2018-06-25 08:24:16.591742973 -0700
  12. @@ -13,6 +13,7 @@
  13. AC_PREREQ(2.59)
  14. AC_INIT([Cbc],[2.9.6],[cbc@lists.coin-or.org])
  15. +m4_include([../BuildTools/coin.m4])
  16. AC_COPYRIGHT([
  17. Copyright 2006 International Business Machines and others.
  18. diff -ur CoinMP-1.8.3.orig/Cgl/Makefile.am CoinMP-1.8.3/Cgl/Makefile.am
  19. --- CoinMP-1.8.3.orig/Cgl/Makefile.am 2015-02-07 11:56:21.000000000 -0800
  20. +++ CoinMP-1.8.3/Cgl/Makefile.am 2018-06-25 08:32:03.454397372 -0700
  21. @@ -96,4 +96,4 @@
  22. # Files that are generated and should be cleaned with make distclean
  23. DISTCLEANFILES =
  24. -include BuildTools/Makemain.inc
  25. +include ../BuildTools/Makemain.inc
  26. diff -ur CoinMP-1.8.3.orig/Cgl/configure.ac CoinMP-1.8.3/Cgl/configure.ac
  27. --- CoinMP-1.8.3.orig/Cgl/configure.ac 2015-09-22 08:01:33.000000000 -0700
  28. +++ CoinMP-1.8.3/Cgl/configure.ac 2018-06-25 08:24:22.583802788 -0700
  29. @@ -13,6 +13,7 @@
  30. AC_PREREQ(2.59)
  31. AC_INIT([Cgl],[0.59.7],[cgl@list.coin-or.org])
  32. +m4_include([../BuildTools/coin.m4])
  33. AC_COPYRIGHT([
  34. Copyright 2006 International Business Machines and others.
  35. diff -ur CoinMP-1.8.3.orig/Clp/Makefile.am CoinMP-1.8.3/Clp/Makefile.am
  36. --- CoinMP-1.8.3.orig/Clp/Makefile.am 2015-03-09 08:16:55.000000000 -0700
  37. +++ CoinMP-1.8.3/Clp/Makefile.am 2018-06-25 08:32:36.001721419 -0700
  38. @@ -146,4 +146,4 @@
  39. # Files that are generated and should be cleaned with make distclean
  40. DISTCLEANFILES =
  41. -include BuildTools/Makemain.inc
  42. +include ../BuildTools/Makemain.inc
  43. diff -ur CoinMP-1.8.3.orig/Clp/configure.ac CoinMP-1.8.3/Clp/configure.ac
  44. --- CoinMP-1.8.3.orig/Clp/configure.ac 2015-09-21 11:52:13.000000000 -0700
  45. +++ CoinMP-1.8.3/Clp/configure.ac 2018-06-25 08:24:33.811914865 -0700
  46. @@ -13,6 +13,7 @@
  47. AC_PREREQ(2.59)
  48. AC_INIT([Clp],[1.16.8],[clp@list.coin-or.org])
  49. +m4_include([../BuildTools/coin.m4])
  50. AC_COPYRIGHT([
  51. Copyright 2006 International Business Machines and others.
  52. diff -ur CoinMP-1.8.3.orig/CoinMP/Makefile.am CoinMP-1.8.3/CoinMP/Makefile.am
  53. --- CoinMP-1.8.3.orig/CoinMP/Makefile.am 2015-01-27 22:55:44.000000000 -0800
  54. +++ CoinMP-1.8.3/CoinMP/Makefile.am 2018-06-25 08:32:53.339896167 -0700
  55. @@ -88,4 +88,4 @@
  56. # Files that are generated and should be cleaned with make distclean
  57. DISTCLEANFILES =
  58. -include BuildTools/Makemain.inc
  59. +include ../BuildTools/Makemain.inc
  60. diff -ur CoinMP-1.8.3.orig/CoinMP/configure.ac CoinMP-1.8.3/CoinMP/configure.ac
  61. --- CoinMP-1.8.3.orig/CoinMP/configure.ac 2015-09-22 12:52:20.000000000 -0700
  62. +++ CoinMP-1.8.3/CoinMP/configure.ac 2018-06-25 08:24:54.666123010 -0700
  63. @@ -13,6 +13,7 @@
  64. AC_PREREQ(2.59)
  65. AC_INIT([CoinMP],[1.8.3],[coinmp@list.coin-or.org])
  66. +m4_include([../BuildTools/coin.m4])
  67. AC_COPYRIGHT([
  68. Copyright 2006 International Business Machines and others.
  69. diff -ur CoinMP-1.8.3.orig/CoinUtils/Makefile.am CoinMP-1.8.3/CoinUtils/Makefile.am
  70. --- CoinMP-1.8.3.orig/CoinUtils/Makefile.am 2015-02-06 16:02:10.000000000 -0800
  71. +++ CoinMP-1.8.3/CoinUtils/Makefile.am 2018-06-25 08:32:42.258783881 -0700
  72. @@ -93,4 +93,4 @@
  73. # Files that are generated and should be cleaned with make distclean
  74. DISTCLEANFILES =
  75. -include BuildTools/Makemain.inc
  76. +include ../BuildTools/Makemain.inc
  77. diff -ur CoinMP-1.8.3.orig/CoinUtils/configure.ac CoinMP-1.8.3/CoinUtils/configure.ac
  78. --- CoinMP-1.8.3.orig/CoinUtils/configure.ac 2015-09-11 10:04:38.000000000 -0700
  79. +++ CoinMP-1.8.3/CoinUtils/configure.ac 2018-06-25 08:24:39.825974894 -0700
  80. @@ -13,6 +13,7 @@
  81. AC_PREREQ(2.59)
  82. AC_INIT([CoinUtils],[2.10.10],[http://projects.coin-or.org/CoinUtils])
  83. +m4_include([../BuildTools/coin.m4])
  84. AC_COPYRIGHT([
  85. Copyright 2006 International Business Machines and others.
  86. diff -ur CoinMP-1.8.3.orig/Data/Sample/Makefile.am CoinMP-1.8.3/Data/Sample/Makefile.am
  87. --- CoinMP-1.8.3.orig/Data/Sample/Makefile.am 2012-11-21 10:57:40.000000000 -0800
  88. +++ CoinMP-1.8.3/Data/Sample/Makefile.am 2018-06-25 08:31:42.277186499 -0700
  89. @@ -22,7 +22,7 @@
  90. pkgconfiglibdir = $(libdir)/pkgconfig
  91. pkgconfiglib_DATA = coindatasample.pc
  92. -include BuildTools/Makemain.inc
  93. +include ../../BuildTools/Makemain.inc
  94. test:
  95. @echo "No test available."
  96. diff -ur CoinMP-1.8.3.orig/Data/Sample/configure.ac CoinMP-1.8.3/Data/Sample/configure.ac
  97. --- CoinMP-1.8.3.orig/Data/Sample/configure.ac 2015-01-04 18:29:43.000000000 -0800
  98. +++ CoinMP-1.8.3/Data/Sample/configure.ac 2018-06-25 08:24:01.621593527 -0700
  99. @@ -13,6 +13,7 @@
  100. AC_PREREQ(2.59)
  101. AC_INIT([DataSample],[1.2.10],[https://projects.coin-or.org/BuildTools/])
  102. +m4_include([../../BuildTools/coin.m4])
  103. AC_COPYRIGHT([
  104. Copyright 2006 International Business Machines and others.
  105. diff -ur CoinMP-1.8.3.orig/Osi/Makefile.am CoinMP-1.8.3/Osi/Makefile.am
  106. --- CoinMP-1.8.3.orig/Osi/Makefile.am 2015-02-07 11:56:33.000000000 -0800
  107. +++ CoinMP-1.8.3/Osi/Makefile.am 2018-06-25 08:32:26.888630693 -0700
  108. @@ -126,4 +126,4 @@
  109. # Files that are generated and should be cleaned with make distclean
  110. DISTCLEANFILES =
  111. -include BuildTools/Makemain.inc
  112. +include ../BuildTools/Makemain.inc
  113. diff -ur CoinMP-1.8.3.orig/Osi/configure.ac CoinMP-1.8.3/Osi/configure.ac
  114. --- CoinMP-1.8.3.orig/Osi/configure.ac 2015-09-21 15:51:25.000000000 -0700
  115. +++ CoinMP-1.8.3/Osi/configure.ac 2018-06-25 08:24:28.184858698 -0700
  116. @@ -13,6 +13,7 @@
  117. AC_PREREQ(2.59)
  118. AC_INIT([Osi],[0.107.6],[osi@list.coin-or.org])
  119. +m4_include([../BuildTools/coin.m4])
  120. AC_COPYRIGHT([
  121. Copyright 2006 International Business Machines and others.
  122. diff -ur CoinMP-1.8.3.orig/configure.ac CoinMP-1.8.3/configure.ac
  123. --- CoinMP-1.8.3.orig/configure.ac 2015-09-22 12:52:20.000000000 -0700
  124. +++ CoinMP-1.8.3/configure.ac 2018-06-25 08:24:48.602062487 -0700
  125. @@ -13,6 +13,7 @@
  126. AC_PREREQ(2.59)
  127. AC_INIT([CoinMP],[1.8.3],[coinmp@list.coin-or.org])
  128. +m4_include([BuildTools/coin.m4])
  129. AC_COPYRIGHT([
  130. Copyright 2006 International Business Machines and others.