From 19cb9cdfc26d8e209ca88cc10afe0cff554c499b Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sat, 27 Apr 2024 04:39:06 +0200
Subject: Merging upstream version 1.15~pre1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 Makefile.in | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index de54626..cf90c91 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -20,7 +20,9 @@ objs = carg_parser.o minilzip.o
          uninstall uninstall-bin uninstall-lib uninstall-info uninstall-man \
          doc info man check dist clean distclean
 
-all : $(progname_static) $(progname_shared)
+all : lib
+
+lib : $(libname_static) $(libname_shared)
 
 lib$(libname).a : lzlib.o
 	$(AR) $(ARFLAGS) $@ $<
@@ -28,6 +30,8 @@ lib$(libname).a : lzlib.o
 lib$(libname).so.$(pkgversion) : lzlib_sh.o
 	$(CC) $(CFLAGS) $(LDFLAGS) -fpic -fPIC -shared -Wl,--soname=lib$(libname).so.$(soversion) -o $@ $<
 
+bin : $(progname_static) $(progname_shared)
+
 $(progname) : $(objs) lib$(libname).a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(objs) lib$(libname).a
 
@@ -54,7 +58,8 @@ lzlib_sh.o : lzlib.c
 
 # prevent 'make' from trying to remake source files
 $(VPATH)/configure $(VPATH)/Makefile.in $(VPATH)/doc/$(pkgname).texi : ;
-%.h %.c : ;
+MAKEFLAGS += -r
+.SUFFIXES :
 
 lzdeps = lzlib.h lzip.h cbuffer.c decoder.h decoder.c encoder_base.h \
          encoder_base.c encoder.h encoder.c fast_encoder.h fast_encoder.c
@@ -93,21 +98,21 @@ install-strip-compress : install-lib-strip install-info-compress
 install-bin-compress : install-bin install-man-compress
 install-bin-strip-compress : install-bin-strip install-man-compress
 
-install-bin : all
+install-bin : bin install-man
 	if [ ! -d "$(DESTDIR)$(bindir)" ] ; then $(INSTALL_DIR) "$(DESTDIR)$(bindir)" ; fi
 	$(INSTALL_PROGRAM) ./$(progname_lzip) "$(DESTDIR)$(bindir)/$(progname)"
 
-install-bin-strip : all
+install-bin-strip : bin
 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install-bin
 
-install-lib : all
+install-lib : lib
 	if [ ! -d "$(DESTDIR)$(includedir)" ] ; then $(INSTALL_DIR) "$(DESTDIR)$(includedir)" ; fi
 	if [ ! -d "$(DESTDIR)$(libdir)" ] ; then $(INSTALL_DIR) "$(DESTDIR)$(libdir)" ; fi
 	$(INSTALL_DATA) $(VPATH)/$(libname)lib.h "$(DESTDIR)$(includedir)/$(libname)lib.h"
-	if [ -n "$(progname_static)" ] ; then \
+	if [ -n "$(libname_static)" ] ; then \
 	  $(INSTALL_DATA) ./lib$(libname).a "$(DESTDIR)$(libdir)/lib$(libname).a" ; \
 	fi
-	if [ -n "$(progname_shared)" ] ; then \
+	if [ -n "$(libname_shared)" ] ; then \
 	  $(INSTALL_PROGRAM) ./lib$(libname).so.$(pkgversion) "$(DESTDIR)$(libdir)/lib$(libname).so.$(pkgversion)" ; \
 	  if [ -e "$(DESTDIR)$(libdir)/lib$(libname).so.$(soversion)" ] ; then \
 	    run_ldconfig=no ; \
@@ -121,7 +126,7 @@ install-lib : all
 	     [ -x "$(LDCONFIG)" ] ; then "$(LDCONFIG)" -n "$(DESTDIR)$(libdir)" || true ; fi ; \
 	fi
 
-install-lib-strip : all
+install-lib-strip : lib
 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install-lib
 
 install-info :
-- 
cgit v1.2.3