mingw-cvs Mailing List for MinGW - Minimalist GNU for Windows

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Repository: mingw-org-wsl".

The branch, 4.0-dev has been updated
       via  796e3f70c06d0c85c7d9a6fd71ea4ec25849aed0 (commit)
      from  436fb15075b547dc77c5bf46f0aeec5e9e6de408 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://sf.net/p/mingw/mingw-org-wsl/ci/796e3f70c06d0c85c7d9a6fd71ea4ec25849aed0/

commit 796e3f70c06d0c85c7d9a6fd71ea4ec25849aed0
Author: Keith Marshall <kei...@us...>
Date:   Sat Dec 21 17:01:16 2013 +0000

    Avoid gratuitously overriding makefile build rules.

diff --git a/ChangeLog b/ChangeLog
index e31275c..984c8d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2013-12-21  Keith Marshall  <kei...@us...>
+
+	Avoid gratuitously overriding makefile build rules.
+
+	* Makefile.in (DRV_TARGETS, DRV_OR_DLL): New macros; define them.
+	(winapi_lib_LIBRARIES): Use them; adapt generic command set to handle
+	cases where supplementary objects must be added to .def file payload.
+	(libws2_32.a, libshell32.a): Now built by this generic rule; delete
+	redundant explicit build rules.
+
 2013-12-20  Keith Marshall  <kei...@us...>
 
 	Correct invalid makefile shell command syntax.
diff --git a/Makefile.in b/Makefile.in
index 5e9fe8c..075caf0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -684,15 +684,19 @@ $(moldname_DEF): lib/lib32/moldname.def.in
 		$? > $@
 
 SRCDIR := lib/lib32
-$(notdir $(winapi_lib_LIBRARIES)): $(addprefix lib/lib32/,$(winapi_DEF))
-	@echo Making library $@ from $(subst lib,,$(@:.a=.def)).
-	if test $@ = libwinspool.a; then \
-	  $(DLLTOOL) $(DLLTOOL_FLAGS) $(subst lib,,$(@:.a=.drv)) --def $(addprefix $(top_srcdir)/lib/lib32/,$(subst lib,,$(@:.a=.def))) --output-lib $@ ; \
-	else \
-	  $(DLLTOOL) $(DLLTOOL_FLAGS) $(subst lib,,$(@:.a=.dll)) --def $(addprefix $(top_srcdir)/lib/lib32/,$(subst lib,,$(@:.a=.def))) --output-lib $@ ; \
-	fi
+DRV_TARGETS = winspool
+DRV_OR_DLL = `case $* in $(DRV_TARGETS)) echo drv ;; *) echo dll ;; esac`
+vpath %.def ${top_srcdir}/lib/lib32
+
+$(winapi_lib_LIBRARIES): lib%.a: %.def
+	@echo Making library $@ from $<
+	$(DLLTOOL) $(DLLTOOL_FLAGS) $*.$(DRV_OR_DLL) --def $< --output-lib $@
+	test -z "$(lib$*_a_OBJECTS)" || $(AR) rc $@ $(lib$*_a_OBJECTS)
 	$(RANLIB) $@
 
+libshell32.a: shell32.def $(libshell32_a_OBJECTS)
+libws2_32.a: ws2_32.def $(libws2_32_a_OBJECTS)
+
 $(notdir $(winapi_mri_LIBRARIES)): $(addprefix lib/lib32/,$(winapi_MRI))
 	@echo Making library $@ from $<.
 	$(AR) -M < $<
@@ -861,22 +865,6 @@ libstrmiids.a: $(libstrmiids_a_OBJECTS)
 	$(AR) rc $@ $(libstrmiids_a_OBJECTS)
 	$(RANLIB) $@
 
-# Note this target will override the previous global rules and give a warning
-# from the make process. It is needed due to the extra ws2_32.o object file.
-libws2_32.a: lib/lib32/ws2_32.def $(libws2_32_a_OBJECTS)
-	@echo Making library $@ from $(subst lib,,$(@:.a=.def)).
-	$(DLLTOOL) $(DLLTOOL_FLAGS) $(subst lib,,$(@:.a=.dll)) --def $(addprefix $(top_srcdir)/lib/lib32/,$(subst lib,,$(@:.a=.def))) --output-lib $@
-	$(AR) rc $@ $(libws2_32_a_OBJECTS)
-	$(RANLIB) $@
-
-# Note this target will override the previous global rules and give a warning
-# from the make process. It is needed due to the extra shell32.o object file.
-libshell32.a: lib/lib32/shell32.def $(libshell32_a_OBJECTS)
-	@echo Making library $@ from $(subst lib,,$(@:.a=.def)).
-	$(DLLTOOL) $(DLLTOOL_FLAGS) $(subst lib,,$(@:.a=.dll)) --def $(addprefix $(top_srcdir)/lib/lib32/,$(subst lib,,$(@:.a=.def))) --output-lib $@
-	$(AR) rc $@ $(libshell32_a_OBJECTS)
-	$(RANLIB) $@
-
 _libm_dummy.c:
 	@echo "static int __mingw_libm_dummy;" > _libm_dummy.c
 

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog   |   10 ++++++++++
 Makefile.in |   34 +++++++++++-----------------------
 2 files changed, 21 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
Repository: mingw-org-wsl

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Repository: mingw-org-wsl".

The branch, 4.0-dev has been updated
       via  436fb15075b547dc77c5bf46f0aeec5e9e6de408 (commit)
      from  b6761db45b70f7def58ec55186574a084836450e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://sf.net/p/mingw/mingw-org-wsl/ci/436fb15075b547dc77c5bf46f0aeec5e9e6de408/

commit 436fb15075b547dc77c5bf46f0aeec5e9e6de408
Author: Keith Marshall <kei...@us...>
Date:   Fri Dec 20 22:32:39 2013 +0000

    Correct invalid makefile shell command syntax.

diff --git a/ChangeLog b/ChangeLog
index e93dbaf..e31275c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-12-20  Keith Marshall  <kei...@us...>
+
+	Correct invalid makefile shell command syntax.
+
+	* Makefile.in (msvcrt_DEF, moldname_DEF): '==' is not a valid operator
+	in 'test' command -- should be '='; fix it.
+
 2013-09-18  Earnie Boyd  <ea...@us...>
 
 	Ticket [#2050] Missing definition of FILE_FLAG_FIRST_PIPE_INSTANCE.
diff --git a/Makefile.in b/Makefile.in
index fa5d626..5e9fe8c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -658,7 +658,7 @@ all: $(extra_OBJECTS) $(msvcrt_DEF) $(moldname_DEF) $(lib_LIBRARIES) $(bin_LIBRA
 
 $(msvcrt_DEF): lib/lib32/msvcrt.def.in
 	N=`echo $@ | sed -e 's|\([a-z]*\)\([0-9]*\).*|\1|'`; \
-	test "$$N" == "msvcr" && N="msvcrt"; \
+	test "$$N" = "msvcr" && N="msvcrt"; \
 	V=`echo $@ | sed -e 's|\([a-z]*\)\([0-9]*\).*|\2|'`; \
 	test -z "$$V" && V=60; \
 	test "$$V" != "100" && V="0$${V}"; \
@@ -671,7 +671,7 @@ $(msvcrt_DEF): lib/lib32/msvcrt.def.in
 
 $(moldname_DEF): lib/lib32/moldname.def.in
 	N=`echo $@ | sed -e 's|\([a-z]*\)\([0-9]*\).*|\1|'`; \
-	test "$$N" == "msvcr" && N="msvcrt"; \
+	test "$$N" = "msvcr" && N="msvcrt"; \
 	V=`echo $@ | sed -e 's|\([a-z]*\)\([0-9]*\).*|\2|'`; \
 	test -z "$$V" && V=60; \
 	F="$@"; \

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog   |    7 +++++++
 Makefile.in |    4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Repository: mingw-org-wsl