02-Makefile.in.patch 13 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312
  1. Description: Changes for building shared libraries
  2. This patch includes changes for building shared libraries with PIC object
  3. files and the correct soname and libname.
  4. Author: Daniel Rus Morales <danirus@tol-project.org>
  5. Index: dmalloc-5.5.2/Makefile.in
  6. ===================================================================
  7. --- dmalloc-5.5.2.orig/Makefile.in
  8. +++ dmalloc-5.5.2/Makefile.in
  9. @@ -41,7 +41,7 @@ LIBRARY = lib$(MODULE).a
  10. # thread version of the library
  11. LIB_TH = lib$(MODULE)th.a
  12. -LIB_TH_SL = lib$(MODULE)th.@shlibext@
  13. +LIB_TH_SL = lib$(MODULE)th.@shlibext@.5.5.2
  14. @TH_ON@BUILD_ALL_1 = threads
  15. @TH_ON@INSTALL_LIB_1 = installth
  16. @SL_ON@BUILD_THREADS_1 = $(LIB_TH_SL)
  17. @@ -50,8 +50,8 @@ LIB_TH_SL = lib$(MODULE)th.@shlibext@
  18. @TH_ON@@SL_ON@INSTALL_LIB_2 = installthsl
  19. # C++ version of the library
  20. -LIB_CXX = lib$(MODULE)xx.a
  21. -LIB_CXX_SL = lib$(MODULE)xx.@shlibext@
  22. +LIB_CXX = lib$(MODULE)cxx.a
  23. +LIB_CXX_SL = lib$(MODULE)cxx.@shlibext@.5.5.2
  24. @CXX_ON@BUILD_ALL_3 = $(LIB_CXX)
  25. @CXX_ON@INSTALL_LIB_3 = installcxx
  26. @SL_ON@BUILD_CXX_3 = $(LIB_CXX_SL)
  27. @@ -61,7 +61,7 @@ LIB_CXX_SL = lib$(MODULE)xx.@shlibext@
  28. # threads + C++
  29. LIB_TH_CXX = lib$(MODULE)thcxx.a
  30. -LIB_TH_CXX_SL = lib$(MODULE)thcxx.@shlibext@
  31. +LIB_TH_CXX_SL = lib$(MODULE)thcxx.@shlibext@.5.5.2
  32. @TH_ON@@CXX_ON@BUILD_ALL_5 = $(LIB_TH_CXX)
  33. @TH_ON@@CXX_ON@INSTALL_LIB_5 = installthcxx
  34. @TH_ON@BUILD_CXX_5 = $(LIB_TH_CXX)
  35. @@ -76,7 +76,7 @@ LIB_TH_CXX_SL = lib$(MODULE)thcxx.@shlib
  36. @CXX_ON@@SL_ON@INSTALL_THREADS_6 = installthcxxsl
  37. # shared versions of the libraries
  38. -LIB_SL = lib$(MODULE).@shlibext@
  39. +LIB_SL = lib$(MODULE).@shlibext@.5.5.2
  40. @SL_ON@BUILD_ALL_7 = $(LIB_SL)
  41. @SL_ON@INSTALL_LIB_7 = installsl
  42. @SL_ON@BUILD_TH_CXX_7 = $(LIB_TH_CXX_SL)
  43. @@ -145,9 +145,13 @@ SHELL = /bin/sh
  44. HFLS = dmalloc.h
  45. OBJS = arg_check.o compat.o dmalloc_rand.o dmalloc_tab.o env.o heap.o
  46. +OBJS_SL = arg_check_sl.o compat_sl.o dmalloc_rand_sl.o dmalloc_tab_sl.o env_sl.o heap_sl.o
  47. NORMAL_OBJS = chunk.o error.o malloc.o
  48. +NORMAL_OBJS_SL = chunk_sl.o error_sl.o malloc_sl.o
  49. THREAD_OBJS = chunk_th.o error_th.o malloc_th.o
  50. +THREAD_OBJS_SL = chunk_th_sl.o error_th_sl.o malloc_th_sl.o
  51. CXX_OBJS = dmallocc.o
  52. +CXX_OBJS_SL = dmallocc_sl.o
  53. CFLAGS = $(CCFLAGS)
  54. TEST = $(MODULE)_t
  55. @@ -160,9 +164,9 @@ all : $(BUILD_ALL)
  56. clean :
  57. rm -f $(A_OUT) core *.o *.t
  58. - rm -f $(LIBRARY) $(LIB_TH) $(LIB_CXX) $(LIB_TH_CXX) $(TEST) $(TEST_FC)
  59. - rm -f $(LIB_TH_SL) $(LIB_CXX_SL) $(LIB_TH_CXX_SL) $(LIB_SL)
  60. + rm -f $(TEST) $(TEST_FC)
  61. rm -f $(UTIL) dmalloc.h
  62. + rm -f lib$(MODULE)*.*
  63. realclean : clean
  64. @@ -181,43 +185,43 @@ installincs : $(HFLS)
  65. $(INSTALL_DATA) $(HFLS) $(includedir)
  66. installthsl : $(LIB_TH_SL)
  67. - $(srcdir)/mkinstalldirs $(libdir)
  68. - $(INSTALL_PROGRAM) $(LIB_TH_SL) $(libdir)
  69. + $(srcdir)/mkinstalldirs $(shlibdir)
  70. + $(INSTALL) $(LIB_TH_SL) $(shlibdir)
  71. installth : $(INSTALL_THREADS)
  72. $(srcdir)/mkinstalldirs $(libdir)
  73. - $(INSTALL_PROGRAM) $(LIB_TH) $(libdir)
  74. + $(INSTALL) $(LIB_TH) $(libdir)
  75. @CXX_OFF@ @echo "Enter 'make installthcxx' to install the threaded C++ library"
  76. @SL_OFF@ @echo "Enter 'make installthsl' to install the threaded shared-library"
  77. installthcxxsl : $(LIB_TH_CXX_SL)
  78. $(srcdir)/mkinstalldirs $(shlibdir)
  79. - $(INSTALL_PROGRAM) $(LIB_TH_CXX_SL) $(shlibdir)
  80. + $(INSTALL) $(LIB_TH_CXX_SL) $(shlibdir)
  81. installthcxx : $(INSTALL_TH_CXX)
  82. $(srcdir)/mkinstalldirs $(libdir)
  83. - $(INSTALL_PROGRAM) $(LIB_TH_CXX) $(libdir)
  84. + $(INSTALL) $(LIB_TH_CXX) $(libdir)
  85. @SL_OFF@ @echo "Enter 'make installthcxxsl' to install the threaded C++ shared-library"
  86. installcxxsl : $(LIB_CXX_SL)
  87. - $(srcdir)/mkinstalldirs $(libdir)
  88. - $(INSTALL_PROGRAM) $(LIB_CXX_SL) $(libdir)
  89. + $(srcdir)/mkinstalldirs $(shlibdir)
  90. + $(INSTALL) $(LIB_CXX_SL) $(shlibdir)
  91. installcxx : $(INSTALL_CXX)
  92. $(srcdir)/mkinstalldirs $(libdir)
  93. - $(INSTALL_PROGRAM) $(LIB_CXX) $(libdir)
  94. + $(INSTALL) $(LIB_CXX) $(libdir)
  95. @TH_OFF@ @echo "Enter 'make installthcxx' to install the threaded C++ library"
  96. @SL_OFF@ @echo "Enter 'make installcxxsl' to install the C++ shared-library"
  97. installsl : $(LIB_SL)
  98. $(srcdir)/mkinstalldirs $(shlibdir)
  99. - $(INSTALL_PROGRAM) $(LIB_SL) $(shlibdir)
  100. + $(INSTALL) $(LIB_SL) $(shlibdir)
  101. @CXX_OFF@ @echo "Enter 'make installcxxsl' to install the C++ shared-library"
  102. @TH_OFF@ @echo "Enter 'make installthsl' to install thread shared-library"
  103. installlib : $(INSTALL_LIB)
  104. $(srcdir)/mkinstalldirs $(libdir)
  105. - $(INSTALL_PROGRAM) $(LIBRARY) $(libdir)
  106. + $(INSTALL) $(LIBRARY) $(libdir)
  107. @RANLIB@ $(libdir)/$(LIBRARY)
  108. @SL_OFF@ @echo "Enter 'make installsl' to install $(LIB_SL) in $(shlibdir)"
  109. @CXX_OFF@ @echo "Enter 'make installcxx' to install the C++ library"
  110. @@ -255,10 +259,8 @@ shlib : $(BUILD_SL)
  111. # NOTE: you may have to edit the configure.ac script to get this to
  112. # work on your operating system. Please send feedback to the author
  113. # via: http://256.com/gray/email.html
  114. -$(LIB_SL) : $(LIBRARY)
  115. - rm -f $@ $@.t
  116. - @shlinkargs@ $(LIBRARY) $(OBJS) $(NORMAL_OBJS)
  117. - mv $@.t $@
  118. +$(LIB_SL) : $(OBJS_SL) $(NORMAL_OBJS_SL)
  119. + $(CC) -shared -Wl,-soname,libdmalloc.so.5 -o $@ $(OBJS_SL) $(NORMAL_OBJS_SL)
  120. $(LIBRARY) : $(OBJS) $(NORMAL_OBJS)
  121. ar cr $@ $?
  122. @@ -268,32 +270,26 @@ $(LIB_TH) : $(OBJS) $(THREAD_OBJS)
  123. ar cr $@ $?
  124. @RANLIB@ $@
  125. -$(LIB_TH_SL) : $(LIB_TH)
  126. - rm -f $@ $@.t
  127. - @shlinkargs@ $(LIB_TH) $(OBJS) $(THREAD_OBJS)
  128. - mv $@.t $@
  129. +$(LIB_TH_SL) : $(OBJS_SL) $(THREAD_OBJS_SL)
  130. + $(CC) -shared -Wl,-soname,libdmallocth.so.5 -o $@ $(OBJS_SL) $(THREAD_OBJS_SL)
  131. $(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS)
  132. ar cr $@ $?
  133. @RANLIB@ $@
  134. -$(LIB_CXX_SL) : $(LIB_CXX)
  135. - rm -f $@ $@.t
  136. - @shlinkargs@ $(LIB_CXX) $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS)
  137. - mv $@.t $@
  138. +$(LIB_CXX_SL) : $(OBJS_SL) $(NORMAL_OBJS_SL) $(CXX_OBJS_SL)
  139. + $(CC) -shared -Wl,-soname,libdmalloccxx.so.5 -o $@ $(OBJS_SL) $(NORMAL_OBJS_SL) $(CXX_OBJS_SL)
  140. $(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS)
  141. ar cr $@ $?
  142. @RANLIB@ $@
  143. -$(LIB_TH_CXX_SL) : $(LIB_TH_CXX)
  144. - rm -f $@ $@.t
  145. - @shlinkargs@ $(LIB_TH_CXX) $(OBJS) $(THREAD_OBJS) $(CXX_OBJS)
  146. - mv $@.t $@
  147. +$(LIB_TH_CXX_SL) : $(OBJS_SL) $(THREAD_OBJS_SL) $(CXX_OBJS_SL)
  148. + $(CC) -shared -Wl,-soname,libdmallocthcxx.so.5 -o $@ $(OBJS_SL) $(THREAD_OBJS_SL) $(CXX_OBJS_SL)
  149. -threadssl : $(LIB_TH_SL)
  150. +threadssl : $(LIB_TH_SL)$(ver)
  151. -threadscxxsl : $(LIB_TH_CXX_SL)
  152. +threadscxxsl : $(LIB_TH_CXX_SL)$(ver)
  153. threadscxx : $(BUILD_TH_CXX)
  154. @SL_OFF@ @echo "Enter 'make threadscxxsl' to build the threaded C++ shared-library"
  155. @@ -302,7 +298,7 @@ threads : $(BUILD_THREADS)
  156. @CXX_OFF@ @echo "Enter 'make threadscxx' to build the threaded C++ library"
  157. @SL_OFF@ @echo "Enter 'make threadssl' to build the threaded shared library"
  158. -cxxsl : $(LIB_CXX_SL)
  159. +cxxsl : $(LIB_CXX_SL)$(ver)
  160. cxx : $(BUILD_CXX)
  161. @SL_OFF@ @echo "Enter 'make cxxsl' to build the cxx shared library"
  162. @@ -371,6 +367,11 @@ dmallocc.o : $(srcdir)/dmallocc.cc
  163. $(CXX) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(INCS) -c $(srcdir)/dmallocc.cc \
  164. -o ./$@
  165. +dmallocc_sl.o : $(srcdir)/dmallocc.cc
  166. + rm -f $@
  167. + $(CXX) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $(srcdir)/dmallocc.cc \
  168. + -o ./$@
  169. +
  170. #
  171. # auto configure settings - uncomment if you are doing configure
  172. # development on the library
  173. @@ -395,38 +396,109 @@ dmallocc.o : $(srcdir)/dmallocc.cc
  174. arg_check.o: arg_check.c conf.h settings.h dmalloc.h chunk.h debug_tok.h \
  175. dmalloc_loc.h error.h arg_check.h
  176. +arg_check_sl.o: arg_check.c conf.h settings.h dmalloc.h chunk.h debug_tok.h \
  177. + dmalloc_loc.h error.h arg_check.h
  178. + rm -f $@
  179. + $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@
  180. chunk.o: chunk.c conf.h settings.h dmalloc.h chunk.h chunk_loc.h \
  181. dmalloc_loc.h compat.h debug_tok.h dmalloc_rand.h dmalloc_tab.h error.h \
  182. error_val.h heap.h
  183. +chunk_sl.o: chunk.c conf.h settings.h dmalloc.h chunk.h chunk_loc.h \
  184. + dmalloc_loc.h compat.h debug_tok.h dmalloc_rand.h dmalloc_tab.h error.h \
  185. + error_val.h heap.h
  186. + rm -f $@
  187. + $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@
  188. compat.o: compat.c conf.h settings.h dmalloc.h compat.h dmalloc_loc.h
  189. +compat_sl.o: compat.c conf.h settings.h dmalloc.h compat.h dmalloc_loc.h
  190. + rm -f $@
  191. + $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@
  192. dmalloc.o: dmalloc.c conf.h settings.h dmalloc_argv.h dmalloc.h compat.h \
  193. debug_tok.h dmalloc_loc.h env.h error_val.h version.h
  194. +dmalloc_sl.o: dmalloc.c conf.h settings.h dmalloc_argv.h dmalloc.h compat.h \
  195. + debug_tok.h dmalloc_loc.h env.h error_val.h version.h
  196. + rm -f $@
  197. + $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@
  198. dmalloc_argv.o: dmalloc_argv.c conf.h settings.h dmalloc_argv.h \
  199. dmalloc_argv_loc.h compat.h
  200. +dmalloc_argv_sl.o: dmalloc_argv.c conf.h settings.h dmalloc_argv.h \
  201. + dmalloc_argv_loc.h compat.h
  202. + rm -f $@
  203. + $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@
  204. dmalloc_fc_t.o: dmalloc_fc_t.c conf.h settings.h dmalloc.h dmalloc_argv.h \
  205. dmalloc_rand.h debug_tok.h dmalloc_loc.h error_val.h
  206. +dmalloc_fc_t_sl.o: dmalloc_fc_t.c conf.h settings.h dmalloc.h dmalloc_argv.h \
  207. + dmalloc_rand.h debug_tok.h dmalloc_loc.h error_val.h
  208. + rm -f $@
  209. + $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@
  210. dmalloc_rand.o: dmalloc_rand.c dmalloc_rand.h
  211. +dmalloc_rand_sl.o: dmalloc_rand.c dmalloc_rand.h
  212. + rm -f $@
  213. + $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@
  214. dmalloc_t.o: dmalloc_t.c conf.h settings.h compat.h dmalloc.h \
  215. dmalloc_argv.h dmalloc_rand.h arg_check.h debug_tok.h dmalloc_loc.h \
  216. error_val.h heap.h
  217. +dmalloc_t_sl.o: dmalloc_t.c conf.h settings.h compat.h dmalloc.h \
  218. + dmalloc_argv.h dmalloc_rand.h arg_check.h debug_tok.h dmalloc_loc.h \
  219. + error_val.h heap.h
  220. + rm -f $@
  221. + $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@
  222. dmalloc_tab.o: dmalloc_tab.c conf.h settings.h chunk.h compat.h dmalloc.h \
  223. dmalloc_loc.h error.h error_val.h dmalloc_tab.h dmalloc_tab_loc.h
  224. +dmalloc_tab_sl.o: dmalloc_tab.c conf.h settings.h chunk.h compat.h dmalloc.h \
  225. + dmalloc_loc.h error.h error_val.h dmalloc_tab.h dmalloc_tab_loc.h
  226. + rm -f $@
  227. + $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@
  228. env.o: env.c conf.h settings.h dmalloc.h compat.h dmalloc_loc.h \
  229. debug_tok.h env.h error.h
  230. +env_sl.o: env.c conf.h settings.h dmalloc.h compat.h dmalloc_loc.h \
  231. + debug_tok.h env.h error.h
  232. + rm -f $@
  233. + $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@
  234. error.o: error.c conf.h settings.h dmalloc.h chunk.h compat.h debug_tok.h \
  235. dmalloc_loc.h env.h error.h error_val.h version.h
  236. +error_sl.o: error.c conf.h settings.h dmalloc.h chunk.h compat.h debug_tok.h \
  237. + dmalloc_loc.h env.h error.h error_val.h version.h
  238. + rm -f $@
  239. + $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@
  240. heap.o: heap.c conf.h settings.h dmalloc.h chunk.h compat.h debug_tok.h \
  241. dmalloc_loc.h error.h error_val.h heap.h
  242. +heap_sl.o: heap.c conf.h settings.h dmalloc.h chunk.h compat.h debug_tok.h \
  243. + dmalloc_loc.h error.h error_val.h heap.h
  244. + rm -f $@
  245. + $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@
  246. malloc.o: malloc.c conf.h settings.h dmalloc.h chunk.h compat.h \
  247. debug_tok.h dmalloc_loc.h env.h error.h error_val.h heap.h \
  248. malloc_funcs.h return.h
  249. +malloc_sl.o: malloc.c conf.h settings.h dmalloc.h chunk.h compat.h \
  250. + debug_tok.h dmalloc_loc.h env.h error.h error_val.h heap.h \
  251. + malloc_funcs.h return.h
  252. + rm -f $@
  253. + $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@
  254. protect.o: protect.c conf.h settings.h dmalloc.h dmalloc_loc.h error.h \
  255. heap.h protect.h
  256. +protect_sl.o: protect.c conf.h settings.h dmalloc.h dmalloc_loc.h error.h \
  257. + heap.h protect.h
  258. + rm -f $@
  259. + $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@
  260. chunk_th.o: chunk.c conf.h settings.h dmalloc.h chunk.h chunk_loc.h \
  261. dmalloc_loc.h compat.h debug_tok.h dmalloc_rand.h dmalloc_tab.h error.h \
  262. error_val.h heap.h
  263. +chunk_th_sl.o: chunk.c conf.h settings.h dmalloc.h chunk.h chunk_loc.h \
  264. + dmalloc_loc.h compat.h debug_tok.h dmalloc_rand.h dmalloc_tab.h error.h \
  265. + error_val.h heap.h
  266. + rm -f $@
  267. + $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@
  268. error_th.o: error.c conf.h settings.h dmalloc.h chunk.h compat.h debug_tok.h \
  269. dmalloc_loc.h env.h error.h error_val.h version.h
  270. +error_th_sl.o: error.c conf.h settings.h dmalloc.h chunk.h compat.h debug_tok.h \
  271. + dmalloc_loc.h env.h error.h error_val.h version.h
  272. + rm -f $@
  273. + $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@
  274. malloc_th.o: malloc.c conf.h settings.h dmalloc.h chunk.h compat.h \
  275. debug_tok.h dmalloc_loc.h env.h error.h error_val.h heap.h \
  276. malloc_funcs.h return.h
  277. +malloc_th_sl.o: malloc.c conf.h settings.h dmalloc.h chunk.h compat.h \
  278. + debug_tok.h dmalloc_loc.h env.h error.h error_val.h heap.h \
  279. + malloc_funcs.h return.h
  280. + rm -f $@
  281. + $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@