0001-Makefile-add-targets-to-manage-static-building.patch 2.3 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071
  1. From 487407d722714f13e8a06d1a9d89f48a5738191e Mon Sep 17 00:00:00 2001
  2. From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  3. Date: Fri, 12 Jul 2019 12:20:38 +0200
  4. Subject: [PATCH] Makefile: add targets to manage static building
  5. Add static-lib, shared-lib, install-static-lib and install-shared-lib
  6. targets to allow the user to build giflib when dynamic library support
  7. is not available or enable on the toolchain
  8. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  9. Upstream: https://sourceforge.net/p/giflib/code/merge-requests/7
  10. ---
  11. Makefile | 18 ++++++++++++++----
  12. 1 file changed, 14 insertions(+), 4 deletions(-)
  13. diff --git a/Makefile b/Makefile
  14. index b2bf6de..111f52f 100644
  15. --- a/Makefile
  16. +++ b/Makefile
  17. @@ -91,13 +91,20 @@ LIBUTILSO = libutil.$(SOEXTENSION)
  18. LIBUTILSOMAJOR = libutil.$(LIBMAJOR).$(SOEXTENSION)
  19. endif
  20. -all: $(LIBGIFSO) libgif.a $(LIBUTILSO) libutil.a $(UTILS)
  21. +SHARED_LIBS = $(LIBGIFSO) $(LIBUTILSO)
  22. +STATIC_LIBS = libgif.a libutil.a
  23. +
  24. +all: shared-lib static-lib $(UTILS)
  25. ifeq ($(UNAME), Darwin)
  26. else
  27. $(MAKE) -C doc
  28. endif
  29. -$(UTILS):: libgif.a libutil.a
  30. +$(UTILS):: $(STATIC_LIBS)
  31. +
  32. +shared-lib: $(SHARED_LIBS)
  33. +
  34. +static-lib: $(STATIC_LIBS)
  35. $(LIBGIFSO): $(OBJECTS) $(HEADERS)
  36. ifeq ($(UNAME), Darwin)
  37. @@ -120,7 +127,7 @@ libutil.a: $(UOBJECTS) $(UHEADERS)
  38. $(AR) rcs libutil.a $(UOBJECTS)
  39. clean:
  40. - rm -f $(UTILS) $(TARGET) libgetarg.a libgif.a $(LIBGIFSO) libutil.a $(LIBUTILSO) *.o
  41. + rm -f $(UTILS) $(TARGET) libgetarg.a $(SHARED_LIBS) $(STATIC_LIBS) *.o
  42. rm -f $(LIBGIFSOVER)
  43. rm -f $(LIBGIFSOMAJOR)
  44. rm -fr doc/*.[17] *.html doc/staging
  45. @@ -145,12 +152,15 @@ install-bin: $(INSTALLABLE)
  46. install-include:
  47. $(INSTALL) -d "$(DESTDIR)$(INCDIR)"
  48. $(INSTALL) -m 644 gif_lib.h "$(DESTDIR)$(INCDIR)"
  49. -install-lib:
  50. +install-static-lib:
  51. $(INSTALL) -d "$(DESTDIR)$(LIBDIR)"
  52. $(INSTALL) -m 644 libgif.a "$(DESTDIR)$(LIBDIR)/libgif.a"
  53. +install-shared-lib:
  54. + $(INSTALL) -d "$(DESTDIR)$(LIBDIR)"
  55. $(INSTALL) -m 755 $(LIBGIFSO) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSOVER)"
  56. ln -sf $(LIBGIFSOVER) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSOMAJOR)"
  57. ln -sf $(LIBGIFSOMAJOR) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSO)"
  58. +install-lib: install-static-lib install-shared-lib
  59. install-man:
  60. $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1" "$(DESTDIR)$(MANDIR)/man7"
  61. $(INSTALL) -m 644 $(MANUAL_PAGES_1:xml=1) "$(DESTDIR)$(MANDIR)/man1"
  62. --
  63. 2.43.0