patch-makefile 9.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154
  1. $OpenBSD: patch-makefile,v 1.1.1.1 2011/10/07 08:58:42 edd Exp $
  2. Honour CFLAGS, LDFLAGS, CPPFLAGS. Use dynamic linking.
  3. --- makefile.orig Mon Apr 26 03:12:56 2010
  4. +++ makefile Mon Oct 3 12:14:16 2011
  5. @@ -15,87 +15,76 @@
  6. # make clean to clean all executables
  7. -#Select one of the following INCLUDE,LIB paths only needed for gmp version
  8. -
  9. -#linux at mcgill with gmp version 3
  10. -INCLUDEDIR = /usr/local/include
  11. -LIBDIR = /usr/local/lib
  12. -
  13. -#linux at mcgill with gmp version 2
  14. -#INCLUDEDIR = /labs/cgm/gmp2/include
  15. -#LIBDIR = /labs/cgm/gmp2/lib
  16. -
  17. -
  18. all: lrs.c lrslib.c lrslib.h lrsmp.c lrsmp.h lrslong.c lrslong.h redund.c buffer.c nash.c 2nash.c
  19. - gcc -O3 -DTIMES -DSIGNALS -o lrs lrs.c lrslib.c lrsmp.c
  20. - gcc -O3 -DTIMES -DSIGNALS -o redund redund.c lrslib.c lrsmp.c
  21. - gcc -O3 -DTIMES -DSIGNALS -DLONG -o lrs1 lrs.c lrslib.c lrslong.c
  22. - gcc -O3 -DTIMES -DSIGNALS -DLONG -o redund1 redund.c lrslib.c lrslong.c
  23. - gcc -O3 -DLRS_QUIET -DTIMES -DSIGNALS -o nash nash.c lrslib.c lrsmp.c
  24. - gcc -O3 -o setupnash setupnash.c lrslib.c lrsmp.c
  25. - gcc -O3 -o setupnash2 setupnash2.c lrslib.c lrsmp.c
  26. - gcc -Wall -O3 -o fourier fourier.c lrslib.c lrsmp.c
  27. - gcc -O3 -o buffer buffer.c
  28. - gcc -O3 -o 2nash 2nash.c
  29. + ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -DTIMES -DSIGNALS -o lrs lrs.c lrslib.c lrsmp.c
  30. + ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -DTIMES -DSIGNALS -o redund redund.c lrslib.c lrsmp.c
  31. + ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -DTIMES -DSIGNALS -DLONG -o lrs1 lrs.c lrslib.c lrslong.c
  32. + ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -DTIMES -DSIGNALS -DLONG -o redund1 redund.c lrslib.c lrslong.c
  33. + ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -DLRS_QUIET -DTIMES -DSIGNALS -o nash nash.c lrslib.c lrsmp.c
  34. + ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -o setupnash setupnash.c lrslib.c lrsmp.c
  35. + ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -o setupnash2 setupnash2.c lrslib.c lrsmp.c
  36. + ${CC} ${CPPFLAGS} ${LDFLAGS} -Wall ${CFLAGS} -o fourier fourier.c lrslib.c lrsmp.c
  37. + ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -o buffer buffer.c
  38. + ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -o 2nash 2nash.c
  39. gmp: fourier.c 2gnash.c lrs.c redund.c lrslib.h lrslib.c lrsgmp.h lrsgmp.c nash.c
  40. - gcc -O3 -static -DTIMES -DSIGNALS -DGMP -I${INCLUDEDIR} lrs.c lrslib.c lrsgmp.c -L${LIBDIR} -lgmp -o glrs
  41. - gcc -O3 -static -DTIMES -DSIGNALS -DGMP -I${INCLUDEDIR} redund.c lrslib.c lrsgmp.c -L${LIBDIR} -lgmp -o gredund
  42. - gcc -O3 -static -DLRS_QUIET -DTIMES -DSIGNALS -DGMP -I${INCLUDEDIR} nash.c lrslib.c lrsgmp.c -L${LIBDIR} -lgmp -o gnash
  43. - gcc -O3 -static -DTIMES -DSIGNALS -DGMP -I${INCLUDEDIR} fourier.c lrslib.c lrsgmp.c -L${LIBDIR} -lgmp -o gfourier
  44. - gcc -O3 -o buffer buffer.c
  45. - gcc -O3 -o 2gnash 2gnash.c
  46. - gcc -O3 -static -DTIMES -DSIGNALS -DGMP -I${INCLUDEDIR} fourier.c lrslib.c lrsgmp.c -L${LIBDIR} -lgmp -o gfourier
  47. + ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -DTIMES -DSIGNALS -DGMP lrs.c lrslib.c lrsgmp.c ${LDFLAGS} -lgmp -o glrs
  48. + ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -DTIMES -DSIGNALS -DGMP redund.c lrslib.c lrsgmp.c ${LDFLAGS} -lgmp -o gredund
  49. + ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -DLRS_QUIET -DTIMES -DSIGNALS -DGMP nash.c lrslib.c lrsgmp.c ${LDFLAGS} -lgmp -o gnash
  50. + ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -DTIMES -DSIGNALS -DGMP fourier.c lrslib.c lrsgmp.c ${LDFLAGS} -lgmp -o gfourier
  51. + ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -o buffer buffer.c
  52. + ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -o 2gnash 2gnash.c
  53. + ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -DTIMES -DSIGNALS -DGMP fourier.c lrslib.c lrsgmp.c -lgmp -o gfourier
  54. gnash: lrslib.h lrslib.c lrsgmp.h lrsgmp.c nash.c 2gnash.c
  55. - gcc -O3 -static -DLRS_QUIET -DTIMES -DSIGNALS -DGMP -I${INCLUDEDIR} nash.c lrslib.c lrsgmp.c -L${LIBDIR} -lgmp -o gnash
  56. - gcc -O3 -o 2gnash 2gnash.c
  57. + ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -DLRS_QUIET -DTIMES -DSIGNALS -DGMP nash.c lrslib.c lrsgmp.c ${LDFLAGS} -lgmp -o gnash
  58. + ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -o 2gnash 2gnash.c
  59. all64: lrs.c lrslib.c lrslib.h lrsmp.c lrsmp.h lrslong.c lrslong.h redund.c buffer.c
  60. - gcc -DTIMES -DSIGNALS -DB64 -O3 -o lrs lrs.c lrslib.c lrsmp.c
  61. - gcc -DTIMES -DSIGNALS -DB64 -O3 -o redund redund.c lrslib.c lrsmp.c
  62. - gcc -DTIMES -DSIGNALS -DLONG -DB64 -O3 -o lrs1 lrs.c lrslib.c lrslong.c
  63. - gcc -DTIMES -DSIGNALS -DLONG -DB64 -O3 -o redund1 redund.c lrslib.c lrslong.c
  64. - gcc -O3 -o buffer buffer.c
  65. + ${CC} ${CPPFLAGS} ${LDFLAGS} -DTIMES -DSIGNALS -DB64 ${CFLAGS} -o lrs lrs.c lrslib.c lrsmp.c
  66. + ${CC} ${CPPFLAGS} ${LDFLAGS} -DTIMES -DSIGNALS -DB64 ${CFLAGS} -o redund redund.c lrslib.c lrsmp.c
  67. + ${CC} ${CPPFLAGS} ${LDFLAGS} -DTIMES -DSIGNALS -DLONG -DB64 ${CFLAGS} -o lrs1 lrs.c lrslib.c lrslong.c
  68. + ${CC} ${CPPFLAGS} ${LDFLAGS} -DTIMES -DSIGNALS -DLONG -DB64 ${CFLAGS} -o redund1 redund.c lrslib.c lrslong.c
  69. + ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -o buffer buffer.c
  70. ansi: lrs.c lrslib.c lrslib.h lrsmp.c lrsmp.h lrslong.c lrslong.h redund.c buffer.c nash.c
  71. - gcc -ansi -DTIMES -O3 -o lrs lrs.c lrslib.c lrsmp.c
  72. - gcc -ansi -DTIMES -O3 -o redund redund.c lrslib.c lrsmp.c
  73. - gcc -ansi -DTIMES -DLONG -O3 -o lrs1 lrs.c lrslib.c lrslong.c
  74. - gcc -ansi -DTIMES -DLONG -O3 -o redund1 redund.c lrslib.c lrslong.c
  75. - gcc -O3 -o buffer buffer.c
  76. - gcc -Wall -ansi -O3 -o nash nash.c lrslib.c lrsmp.c
  77. + ${CC} ${CPPFLAGS} ${LDFLAGS} -ansi -DTIMES ${CFLAGS} -o lrs lrs.c lrslib.c lrsmp.c
  78. + ${CC} ${CPPFLAGS} ${LDFLAGS} -ansi -DTIMES ${CFLAGS} -o redund redund.c lrslib.c lrsmp.c
  79. + ${CC} ${CPPFLAGS} ${LDFLAGS} -ansi -DTIMES -DLONG ${CFLAGS} -o lrs1 lrs.c lrslib.c lrslong.c
  80. + ${CC} ${CPPFLAGS} ${LDFLAGS} -ansi -DTIMES -DLONG ${CFLAGS} -o redund1 redund.c lrslib.c lrslong.c
  81. + ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -o buffer buffer.c
  82. + ${CC} ${CPPFLAGS} ${LDFLAGS} -Wall -ansi ${CFLAGS} -o nash nash.c lrslib.c lrsmp.c
  83. nosigs: lrs.c lrslib.c lrslib.h lrsmp.c lrsmp.h lrslong.c lrslong.h redund.c buffer.c
  84. - gcc -ansi -O3 -o lrs lrs.c lrslib.c lrsmp.c
  85. - gcc -ansi -O3 -o redund redund.c lrslib.c lrsmp.c
  86. - gcc -ansi -O3 -DLONG -o lrs1 lrs.c lrslib.c lrslong.c
  87. - gcc -ansi -O3 -DLONG -o redund1 redund.c lrslib.c lrslong.c
  88. - gcc -ansi -O3 -o buffer buffer.c
  89. + ${CC} ${CPPFLAGS} ${LDFLAGS} -ansi ${CFLAGS} -o lrs lrs.c lrslib.c lrsmp.c
  90. + ${CC} ${CPPFLAGS} ${LDFLAGS} -ansi ${CFLAGS} -o redund redund.c lrslib.c lrsmp.c
  91. + ${CC} ${CPPFLAGS} ${LDFLAGS} -ansi ${CFLAGS} -DLONG -o lrs1 lrs.c lrslib.c lrslong.c
  92. + ${CC} ${CPPFLAGS} ${LDFLAGS} -ansi ${CFLAGS} -DLONG -o redund1 redund.c lrslib.c lrslong.c
  93. + ${CC} ${CPPFLAGS} ${LDFLAGS} -ansi ${CFLAGS} -o buffer buffer.c
  94. lrs: lrs.c lrslib.c lrslong.c lrsmp.c
  95. - gcc -Wall -ansi -O3 -o lrs lrs.c lrslib.c lrsmp.c
  96. + ${CC} ${CPPFLAGS} ${LDFLAGS} -Wall -ansi ${CFLAGS} -o lrs lrs.c lrslib.c lrsmp.c
  97. redund: redund.c lrslib.c lrslong.c lrsmp.c
  98. - gcc -Wall -ansi -O3 -o redund redund.c lrslib.c lrsmp.c
  99. + ${CC} ${CPPFLAGS} ${LDFLAGS} -Wall -ansi ${CFLAGS} -o redund redund.c lrslib.c lrsmp.c
  100. nash: setupnash2.c setupnash.c nash.c lrslib.c lrsmp.c 2nash.c
  101. - gcc -Wall -DTIMES -ansi -O3 -o nash nash.c lrslib.c lrsmp.c
  102. - gcc -Wall -o setupnash setupnash.c lrslib.c lrsmp.c
  103. - gcc -Wall -o setupnash2 setupnash2.c lrslib.c lrsmp.c
  104. - gcc -O3 -o 2nash 2nash.c
  105. + ${CC} ${CPPFLAGS} ${LDFLAGS} -Wall -DTIMES -ansi ${CFLAGS} -o nash nash.c lrslib.c lrsmp.c
  106. + ${CC} ${CPPFLAGS} ${LDFLAGS} -Wall -o setupnash setupnash.c lrslib.c lrsmp.c
  107. + ${CC} ${CPPFLAGS} ${LDFLAGS} -Wall -o setupnash2 setupnash2.c lrslib.c lrsmp.c
  108. + ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -o 2nash 2nash.c
  109. fourier: fourier.c lrslib.c lrslong.c lrsmp.c
  110. - gcc -Wall -O3 -o fourier fourier.c lrslib.c lrsmp.c
  111. - gcc -O3 -static -DTIMES -DSIGNALS -DGMP -I${INCLUDEDIR} fourier.c lrslib.c lrsgmp.c -L${LIBDIR} -lgmp -o gfourier
  112. + ${CC} ${CPPFLAGS} ${LDFLAGS} -Wall ${CFLAGS} -o fourier fourier.c lrslib.c lrsmp.c
  113. + ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -DTIMES -DSIGNALS -DGMP fourier.c lrslib.c lrsgmp.c -lgmp -o gfourier
  114. demo: lpdemo.c chdemo.c vedemo.c lrslib.c lrslong.c lrsmp.c
  115. - gcc -Wall -ansi -O3 -o lpdemo lpdemo.c lrslib.c lrsmp.c
  116. - gcc -Wall -ansi -O3 -o vedemo vedemo.c lrslib.c lrsmp.c
  117. - gcc -Wall -ansi -O3 -o chdemo chdemo.c lrslib.c lrsmp.c
  118. + ${CC} ${CPPFLAGS} ${LDFLAGS} -Wall -ansi ${CFLAGS} -o lpdemo lpdemo.c lrslib.c lrsmp.c
  119. + ${CC} ${CPPFLAGS} ${LDFLAGS} -Wall -ansi ${CFLAGS} -o vedemo vedemo.c lrslib.c lrsmp.c
  120. + ${CC} ${CPPFLAGS} ${LDFLAGS} -Wall -ansi ${CFLAGS} -o chdemo chdemo.c lrslib.c lrsmp.c
  121. float: float2rat.c rat2float.c lrsmp.c
  122. - gcc -DLRSMP -Wall -ansi -o float2rat float2rat.c lrsmp.c
  123. - gcc -DLRSMP -Wall -ansi -o rat2float rat2float.c lrsmp.c
  124. + ${CC} ${CPPFLAGS} ${LDFLAGS} -DLRSMP -Wall -ansi -o float2rat float2rat.c lrsmp.c
  125. + ${CC} ${CPPFLAGS} ${LDFLAGS} -DLRSMP -Wall -ansi -o rat2float rat2float.c lrsmp.c
  126. clean:
  127. rm -rf lrs lrs1 redund redund1 buffer glrs gredund
  128. @@ -105,8 +94,8 @@ clean:
  129. rm -rf nash gnash setupnash setupnash2
  130. foo: foo.c lrslib.h lrslib.c lrsmp.h lrsmp.c
  131. - gcc -O3 -static -DTIMES -DSIGNALS foo.c lrslib.c lrsmp.c -L${LIBDIR} -o foo
  132. + ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -DTIMES -DSIGNALS foo.c lrslib.c lrsmp.c ${LDFLAGS} -o foo
  133. gfoo: foo.c lrslib.h lrslib.c lrsgmp.h lrsgmp.c
  134. - gcc -O3 -static -DTIMES -DSIGNALS -DGMP -I${INCLUDEDIR} foo.c lrslib.c lrsgmp.c -L${LIBDIR} -lgmp -o gfoo
  135. + ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -DTIMES -DSIGNALS -DGMP foo.c lrslib.c lrsgmp.c -lgmp -o gfoo