[libmicrohttpd] 02/03: Makefile: support silent rules for static lib

[gnunet]

This is an automated email from the git hooks/post-receive script.

karlson2k pushed a commit to branch master
in repository libmicrohttpd.

commit 65b7612efb61d1dd5a5be286484a306f4145fc25
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
AuthorDate: Tue Dec 14 21:59:37 2021 +0300

    Makefile: support silent rules for static lib
---
 src/microhttpd/Makefile.am | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/microhttpd/Makefile.am b/src/microhttpd/Makefile.am
index 96a77399..c4d62e97 100644
--- a/src/microhttpd/Makefile.am
+++ b/src/microhttpd/Makefile.am
@@ -12,17 +12,17 @@ lib_LTLIBRARIES = \
 noinst_DATA =
 MOSTLYCLEANFILES =
 
+AM_V_LIB = $(am__v_LIB_$(V))
+am__v_LIB_ = $(am__v_LIB_$(AM_DEFAULT_VERBOSITY))
+am__v_LIB_0 = @echo "  LIB     " $@;
+am__v_LIB_1 = 
+
 if W32_SHARED_LIB_EXP
 AM_V_DLLTOOL = $(am__v_DLLTOOL_$(V))
 am__v_DLLTOOL_ = $(am__v_DLLTOOL_$(AM_DEFAULT_VERBOSITY))
 am__v_DLLTOOL_0 = @echo "  DLLTOOL " $@;
 am__v_DLLTOOL_1 = 
 
-AM_V_LIB = $(am__v_LIB_$(V))
-am__v_LIB_ = $(am__v_LIB_$(AM_DEFAULT_VERBOSITY))
-am__v_LIB_0 = @echo "  LIB     " $@;
-am__v_LIB_1 = 
-
 W32_MHD_LIB_LDFLAGS = -Wl,--output-def,$(lt_cv_objdir)/libmicrohttpd.def 
-XCClinker -static-libgcc
 noinst_DATA += $(lt_cv_objdir)/libmicrohttpd.lib 
$(lt_cv_objdir)/libmicrohttpd.def
 MOSTLYCLEANFILES += $(lt_cv_objdir)/libmicrohttpd.lib 
$(lt_cv_objdir)/libmicrohttpd.def $(lt_cv_objdir)/libmicrohttpd.exp
@@ -55,7 +55,7 @@ $(lt_cv_objdir)/libmicrohttpd.lib: 
$(lt_cv_objdir)/libmicrohttpd.def libmicrohtt
 endif
 endif
 else
-  W32_MHD_LIB_LDFLAGS =
+W32_MHD_LIB_LDFLAGS =
 endif
 
 if W32_STATIC_LIB
@@ -64,9 +64,9 @@ MOSTLYCLEANFILES += $(lt_cv_objdir)/libmicrohttpd-static.lib
 
 $(lt_cv_objdir)/libmicrohttpd-static.lib: libmicrohttpd.la 
$(libmicrohttpd_la_OBJECTS)
 if USE_MS_LIB_TOOL
-       $(MS_LIB_TOOL) -out:$@ $(libmicrohttpd_la_OBJECTS:.lo=.o)
+       $(AM_V_LIB) $(MS_LIB_TOOL) -nologo -out:$@ 
$(libmicrohttpd_la_OBJECTS:.lo=.o)
 else
-       cp $(lt_cv_objdir)/libmicrohttpd.a $@
+       $(AM_V_at)cp $(lt_cv_objdir)/libmicrohttpd.a $@
 endif
 endif
 

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.