1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071 |
- From 487407d722714f13e8a06d1a9d89f48a5738191e Mon Sep 17 00:00:00 2001
- From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
- Date: Fri, 12 Jul 2019 12:20:38 +0200
- Subject: [PATCH] Makefile: add targets to manage static building
- Add static-lib, shared-lib, install-static-lib and install-shared-lib
- targets to allow the user to build giflib when dynamic library support
- is not available or enable on the toolchain
- Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
- Upstream: https://sourceforge.net/p/giflib/code/merge-requests/7
- ---
- Makefile | 18 ++++++++++++++----
- 1 file changed, 14 insertions(+), 4 deletions(-)
- diff --git a/Makefile b/Makefile
- index b2bf6de..111f52f 100644
- --- a/Makefile
- +++ b/Makefile
- @@ -91,13 +91,20 @@ LIBUTILSO = libutil.$(SOEXTENSION)
- LIBUTILSOMAJOR = libutil.$(LIBMAJOR).$(SOEXTENSION)
- endif
-
- -all: $(LIBGIFSO) libgif.a $(LIBUTILSO) libutil.a $(UTILS)
- +SHARED_LIBS = $(LIBGIFSO) $(LIBUTILSO)
- +STATIC_LIBS = libgif.a libutil.a
- +
- +all: shared-lib static-lib $(UTILS)
- ifeq ($(UNAME), Darwin)
- else
- $(MAKE) -C doc
- endif
-
- -$(UTILS):: libgif.a libutil.a
- +$(UTILS):: $(STATIC_LIBS)
- +
- +shared-lib: $(SHARED_LIBS)
- +
- +static-lib: $(STATIC_LIBS)
-
- $(LIBGIFSO): $(OBJECTS) $(HEADERS)
- ifeq ($(UNAME), Darwin)
- @@ -120,7 +127,7 @@ libutil.a: $(UOBJECTS) $(UHEADERS)
- $(AR) rcs libutil.a $(UOBJECTS)
-
- clean:
- - rm -f $(UTILS) $(TARGET) libgetarg.a libgif.a $(LIBGIFSO) libutil.a $(LIBUTILSO) *.o
- + rm -f $(UTILS) $(TARGET) libgetarg.a $(SHARED_LIBS) $(STATIC_LIBS) *.o
- rm -f $(LIBGIFSOVER)
- rm -f $(LIBGIFSOMAJOR)
- rm -fr doc/*.[17] *.html doc/staging
- @@ -145,12 +152,15 @@ install-bin: $(INSTALLABLE)
- install-include:
- $(INSTALL) -d "$(DESTDIR)$(INCDIR)"
- $(INSTALL) -m 644 gif_lib.h "$(DESTDIR)$(INCDIR)"
- -install-lib:
- +install-static-lib:
- $(INSTALL) -d "$(DESTDIR)$(LIBDIR)"
- $(INSTALL) -m 644 libgif.a "$(DESTDIR)$(LIBDIR)/libgif.a"
- +install-shared-lib:
- + $(INSTALL) -d "$(DESTDIR)$(LIBDIR)"
- $(INSTALL) -m 755 $(LIBGIFSO) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSOVER)"
- ln -sf $(LIBGIFSOVER) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSOMAJOR)"
- ln -sf $(LIBGIFSOMAJOR) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSO)"
- +install-lib: install-static-lib install-shared-lib
- install-man:
- $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1" "$(DESTDIR)$(MANDIR)/man7"
- $(INSTALL) -m 644 $(MANUAL_PAGES_1:xml=1) "$(DESTDIR)$(MANDIR)/man1"
- --
- 2.43.0
|