[libmicrohttpd] branch master updated (de383203 -> 21f90d55)

[gnunet]

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

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from de383203 Reworked dlltool supported.
     new 2cd73a76 Correction for de383203d4d7921bf331510bc898ab88c5844731
     new 65b7612e Makefile: support silent rules for static lib
     new 21f90d55 Makefile: support silent rules for W32 RC

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/microhttpd/Makefile.am | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/microhttpd/Makefile.am b/src/microhttpd/Makefile.am
index cbb6c8c8..563a8c28 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
@@ -41,21 +41,21 @@ endif
 
 if USE_MS_LIB_TOOL
 $(lt_cv_objdir)/libmicrohttpd.lib: $(lt_cv_objdir)/libmicrohttpd.def 
libmicrohttpd.la $(libmicrohttpd_la_OBJECTS)
-       $(AM_V_at)$(AM_V_LIB) cd "$(lt_cv_objdir)" && dll_name=`$(SED) -n -e 
"s/^dlname='\(.*\)'/\1/p" libmicrohttpd.la` && test -n "$$dll_name" && \
+       $(AM_V_LIB) cd "$(lt_cv_objdir)" && dll_name=`$(SED) -n -e 
"s/^dlname='\(.*\)'/\1/p" libmicrohttpd.la` && test -n "$$dll_name" && \
        $(MS_LIB_TOOL) -nologo -def:libmicrohttpd.def -name:$$dll_name 
-out:libmicrohttpd.lib $(libmicrohttpd_la_OBJECTS:.lo=.o) -ignore:4221
 else
 if USE_EXPORT_FILE
 $(lt_cv_objdir)/libmicrohttpd.lib $(lt_cv_objdir)/libmicrohttpd.exp: 
$(lt_cv_objdir)/libmicrohttpd.def libmicrohttpd.la $(libmicrohttpd_la_OBJECTS)
-       $(AM_V_at)$(AM_V_DLLTOOL) cd "$(lt_cv_objdir)" && dll_name=`$(SED) -n 
-e "s/^dlname='\(.*\)'/\1/p" libmicrohttpd.la` && test -n "$$dll_name" && \
+       $(AM_V_DLLTOOL) cd "$(lt_cv_objdir)" && dll_name=`$(SED) -n -e 
"s/^dlname='\(.*\)'/\1/p" libmicrohttpd.la` && test -n "$$dll_name" && \
        $(DLLTOOL) -d libmicrohttpd.def -D $$dll_name -l libmicrohttpd.lib 
$(libmicrohttpd_la_OBJECTS:.lo=.o) -e ./libmicrohttpd.exp
 else
 $(lt_cv_objdir)/libmicrohttpd.lib: $(lt_cv_objdir)/libmicrohttpd.def 
libmicrohttpd.la
-       $(AM_V_at)$(AM_V_DLLTOOL) cd "$(lt_cv_objdir)" && dll_name=`$(SED) -n 
-e "s/^dlname='\(.*\)'/\1/p" libmicrohttpd.la` && test -n "$$dll_name" && \
+       $(AM_V_DLLTOOL) cd "$(lt_cv_objdir)" && dll_name=`$(SED) -n -e 
"s/^dlname='\(.*\)'/\1/p" libmicrohttpd.la` && test -n "$$dll_name" && \
        $(DLLTOOL) -d libmicrohttpd.def -D $$dll_name -l libmicrohttpd.lib
 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
 
@@ -120,9 +120,14 @@ MHD_DLL_RES_LO = 
libmicrohttpd_la-$(MHD_DLL_RES_SRC:.rc=.lo)
 EXTRA_libmicrohttpd_la_DEPENDENCIES = $(MHD_DLL_RES_LO)
 libmicrohttpd_la_LIBADD += $(MHD_DLL_RES_LO)
 
+AM_V_RC = $(am__v_RC_$(V))
+am__v_RC_ = $(am__v_RC_$(AM_DEFAULT_VERBOSITY))
+am__v_RC_0 = @echo "  RC      " $@;
+am__v_RC_1 = 
+
 # General rule is not required, but keep it just in case
 .rc.lo:
-       $(LIBTOOL) $(AM_V_lt) --tag=RC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) 
--mode=compile $(RC) $(RCFLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(AM_CPPFLAGS) $(CPPFLAGS) $< -o $@
+       $(AM_V_RC) $(LIBTOOL) $(AM_V_lt) --tag=RC $(AM_LIBTOOLFLAGS) 
$(LIBTOOLFLAGS) --mode=compile $(RC) $(RCFLAGS) $(DEFS) $(DEFAULT_INCLUDES) 
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $< -o $@
 
 # To add dll resource only to .dll file and exclude it form static
 # lib, a little trick was used. Allow libtool to create file.lo,
@@ -133,9 +138,9 @@ libmicrohttpd_la_LIBADD += $(MHD_DLL_RES_LO)
 # Note: windres does not understand '-isystem' flag, so all
 # possible '-isystem' flags are replaced by simple '-I' flags.
 $(MHD_DLL_RES_LO): $(MHD_DLL_RES_SRC)
-       RC_CPP_FLAGS=" $(DEFAULT_INCLUDES) $(INCLUDES) 
$(libmicrohttpd_la_CPPFLAGS) $(CPPFLAGS) " && \
-       $(LIBTOOL) $(AM_V_lt) --tag=RC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) 
--mode=compile $(RC) $(RCFLAGS) $(DEFS) $${RC_CPP_FLAGS// -isystem / -I } $< -o 
$@ && \
-       echo > $@-empty.c && $(CC) $(AM_CFLAGS) $(CFLAGS) -c $@-empty.c -o 
$(@:.lo=.o) && rm -f $@-empty.c
+       $(AM_V_RC) RC_CPP_FLAGS=" $(DEFAULT_INCLUDES) $(INCLUDES) 
$(libmicrohttpd_la_CPPFLAGS) $(CPPFLAGS) " && \
+       $(LIBTOOL) $(AM_V_lt) --tag=RC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) 
--mode=compile $(RC) $(RCFLAGS) $(DEFS) $${RC_CPP_FLAGS// -isystem / -I} $< -o 
$@ && \
+       echo > $@-empty.c && $(CC) $(DEFS) $(AM_CFLAGS) $(CFLAGS) -c $@-empty.c 
-o $(@:.lo=.o) && rm -f $@-empty.c
 endif
 
 if USE_COVERAGE

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