patch-makefile_in 3.5 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485
  1. $OpenBSD: patch-makefile_in,v 1.3 2011/04/15 19:29:54 naddy Exp $
  2. --- makefile.in.orig Wed Sep 19 15:19:25 2007
  3. +++ makefile.in Fri Apr 15 01:18:25 2011
  4. @@ -406,8 +406,6 @@ examples: $(EXAMPLE_FILES)
  5. # -------- rules for deleting the generated files --------
  6. -clean:
  7. -
  8. define RM_OBJ_CLEAN_FILES
  9. $(foreach file, $(OBJ_CLEAN_FILES), rm -f $(file)
  10. )
  11. @@ -418,25 +416,24 @@ clean:
  12. )
  13. endef
  14. +clean:
  15. $(RM_OBJ_CLEAN_FILES)
  16. $(RM_OTHER_CLEAN_FILES)
  17. -distclean: clean
  18. -
  19. define RM_DISTCLEAN_FILES
  20. $(foreach file, $(DISTCLEAN_FILES) $(ALLEGRO_LIB_X_EXES), rm -f $(file)
  21. )
  22. endef
  23. +distclean: clean
  24. $(RM_DISTCLEAN_FILES)
  25. -veryclean: distclean
  26. -
  27. define RM_VERYCLEAN_FILES
  28. $(foreach file, $(VERYCLEAN_FILES), rm -f $(file)
  29. )
  30. endef
  31. +veryclean: distclean
  32. $(RM_VERYCLEAN_FILES)
  33. rm -f makefile
  34. @@ -472,9 +469,9 @@ install-lib: lib modules
  35. fi; \
  36. done
  37. @for l in alleg alld allp; do \
  38. - if test -f $(LIBDIR)/lib$${l}-$(shared_version).so; then \
  39. - echo Installing $(LIBDIR)/lib$${l}-$(shared_version).so to $(DESTDIR)$(libdir); \
  40. - $(INSTALL_PROGRAM) $(LIBDIR)/lib$${l}-$(shared_version).so $(DESTDIR)$(libdir)/; \
  41. + if test -f $(LIBDIR)/lib$${l}.so.$(shared_major_minor); then \
  42. + echo Installing $(LIBDIR)/lib$${l}.so.$(shared_major_minor) to $(DESTDIR)$(libdir); \
  43. + $(INSTALL_PROGRAM) $(LIBDIR)/lib$${l}.so.$(shared_major_minor) $(DESTDIR)$(libdir)/; \
  44. $(INSTALL_DATA) $(LIBDIR)/lib$${l}_unsharable.a $(DESTDIR)$(libdir)/; \
  45. fi; \
  46. done
  47. @@ -489,21 +486,6 @@ install-lib: lib modules
  48. $(mkinstalldirs) $(DESTDIR)$(bindir)
  49. @echo Installing allegro-config to $(DESTDIR)$(bindir)
  50. @$(INSTALL_PROGRAM) allegro-config $(DESTDIR)$(bindir)
  51. - @if test -n "$(LIBDIR)/liball*-$(shared_version).so"; then \
  52. - (cat /etc/ld.so.conf | grep $(libdir) >/dev/null || \
  53. - test $(libdir) = /lib || test $(libdir) = /usr/lib) \
  54. - && ($(LDCONFIG) $(libdir) || true) || (\
  55. - echo "" ; \
  56. - echo "Warning: shared library destination $(libdir) is not in ldd search path." ; \
  57. - echo "Unless you add it to /etc/ld.so.conf, you must set LD_LIBRARY_PATH to include"; \
  58. - echo "$(libdir) each time you want to run an Allegro program." ; \
  59. - ) ; \
  60. - fi
  61. - @for l in alleg alld allp; do \
  62. - if test -f $(DESTDIR)$(libdir)/lib$${l}-$(shared_version).so -a \! -h $(DESTDIR)$(libdir)/lib$${l}.so.${shared_major_minor}; then \
  63. - (cd $(DESTDIR)$(libdir); ln -s lib$${l}-$(shared_version).so lib$${l}.so.${shared_major_minor}); \
  64. - fi; \
  65. - done
  66. $(mkinstalldirs) $(DESTDIR)$(prefix)/share/aclocal
  67. @echo Installing allegro.m4 to $(DESTDIR)$(prefix)/share/aclocal
  68. @$(INSTALL_DATA) misc/allegro.m4 $(DESTDIR)$(prefix)/share/aclocal
  69. @@ -687,6 +669,7 @@ depend:
  70. $(SHELL) -c 'cd $(srcdir) && misc/depmod.sh esddigi "\`esd-config --libs\`" $(ALLEGRO_MODULE_ESD_FILES)' >>makefile.dep
  71. $(SHELL) -c 'cd $(srcdir) && misc/depmod.sh artsdigi "\`artsc-config --libs\`" $(ALLEGRO_MODULE_ARTS_FILES)' >>makefile.dep
  72. $(SHELL) -c 'cd $(srcdir) && misc/depmod.sh sgialdigi -laudio $(ALLEGRO_MODULE_SGIAL_FILES)' >>makefile.dep
  73. + $(SHELL) -c 'cd $(srcdir) && misc/depmod.sh sndiodigi -lsndio $(ALLEGRO_MODULE_SNDIO_FILES)' >>makefile.dep
  74. $(SHELL) -c 'cd $(srcdir) && misc/depmod.sh jackdigi "\`pkg-config --libs jack\`" $(ALLEGRO_MODULE_JACK_FILES)' >>makefile.dep
  75. @echo "Generating dependencies for simple programs"
  76. $(SHELL) -c 'cd $(srcdir) && misc/deplexe.sh -- $(ALLEGRO_LIB_EXE_SOURCES) $(ALLEGRO_EXAMPLE_FILES)' >>makefile.dep