From ddc8f81e4256cd01807ec822b8ec458143473156 Mon Sep 17 00:00:00 2001 From: Keith Marshall Date: Thu, 9 Mar 2017 21:19:05 +0000 Subject: [PATCH] Fix generated header file version dependencies. --- mingwrt/ChangeLog | 9 +++++++++ mingwrt/Makefile.in | 8 +++----- w32api/ChangeLog | 9 +++++++++ w32api/Makefile.in | 8 +++----- 4 files changed, 24 insertions(+), 10 deletions(-) diff --git a/mingwrt/ChangeLog b/mingwrt/ChangeLog index b8ee2a7..2051e3c 100644 --- a/mingwrt/ChangeLog +++ b/mingwrt/ChangeLog @@ -1,5 +1,14 @@ 2017-03-09 Keith Marshall + Fix generated header file dependencies. + + * Makefile.in (_mingw.h, w32api): Make them depend on changes in... + [VERSION.m4]: ...this; package version changes are no longer made... + [configure.ac]: ...here; delete associated prerequisite reference. + (distclean-local): Delete them. + +2017-03-09 Keith Marshall + Strip optional DLLs, when staging for distribution. * Makefile.in (mingwrt-%-optist): Recursively make... diff --git a/mingwrt/Makefile.in b/mingwrt/Makefile.in index eef0dbc..e9bcee2 100644 --- a/mingwrt/Makefile.in +++ b/mingwrt/Makefile.in @@ -148,7 +148,8 @@ configure: configure.ac aclocal.m4 VERSION.m4 vpath _mingw.h.in ${top_srcdir}/include vpath w32api.h.in ${w32api_srcdir}/include -_mingw.h w32api.h: configure.ac +_mingw.h w32api.h: %.h: %.h.in VERSION.m4 + $(PACKAGE_VERSION_SCRIPT) $< > $@ PACKAGE_VERSION_SCRIPT = sed \ -e s"`$(call PACKAGE_VERSION_FORMAT,LONG,%d,$$3+1000*($$2+1000*$$1))`" \ @@ -160,9 +161,6 @@ PACKAGE_VERSION_FORMAT = echo $(PACKAGE_VERSION).0.0 | awk -F. '{ \ printf ",%%PACKAGE_VERSION_$1%%,$2,", $3; \ }' -_mingw.h w32api.h: %.h: %.h.in - $(PACKAGE_VERSION_SCRIPT) $< > $@ - # Capture dependencies conveyed within source files, ensuring that # header files are taken from our working source tree, and not from # the build-time compiler's installation path. (Note: we use -MD, @@ -1045,7 +1043,7 @@ mostlyclean-local: $(RM) *.d *.$(OBJEXT) Makefile.stub *.libimpl distclean-local: clean-local - $(RM) config.log config.status libm_dummy.c + $(RM) config.log config.status libm_dummy.c _mingw.h w32api.h maintainer-clean-warning: $(warning $(MAKE) $(@:%-warning=%)) diff --git a/w32api/ChangeLog b/w32api/ChangeLog index 718daa7..fd2bc27 100644 --- a/w32api/ChangeLog +++ b/w32api/ChangeLog @@ -1,3 +1,12 @@ +2017-03-09 Keith Marshall + + Fix generated header file dependencies. + + * Makefile.in (_mingw.h, w32api): Make them depend on changes in... + [VERSION.m4]: ...this; package version changes are no longer made... + [configure.ac]: ...here; delete associated prerequisite reference. + (distclean-local): Delete them. + 2017-03-08 Keith Marshall Prepare and tag for release of w32api-5.0 package set. diff --git a/w32api/Makefile.in b/w32api/Makefile.in index b6d7b83..2ee7204 100644 --- a/w32api/Makefile.in +++ b/w32api/Makefile.in @@ -119,7 +119,8 @@ configure: configure.ac aclocal.m4 VERSION.m4 # vpath %.h.in ${top_srcdir}/include ${mingwrt_srcdir}/include -w32api.h _mingw.h: configure.ac +w32api.h _mingw.h: %.h: %.h.in VERSION.m4 + $(PACKAGE_VERSION_SCRIPT) $< > $@ PACKAGE_VERSION_SCRIPT = sed \ -e s"`$(call PACKAGE_VERSION_FORMAT,LONG,%d,$$3+1000*($$2+1000*$$1))`" \ @@ -131,9 +132,6 @@ PACKAGE_VERSION_FORMAT = echo $(PACKAGE_VERSION).0.0 | awk -F. '{ \ printf ",%%PACKAGE_VERSION_$1%%,$2,", $3; \ }' -w32api.h _mingw.h: %.h: %.h.in - $(PACKAGE_VERSION_SCRIPT) $< > $@ - # Capture dependencies conveyed within source files, ensuring that # header files are taken from our working source tree, and not from # the build-time compiler's installation path. (Note: we use -MD, @@ -395,7 +393,7 @@ mostlyclean-local: $(RM) *.d *.$(OBJEXT) distclean-local: clean-local - $(RM) config.log config.status + $(RM) config.log config.status _mingw.h w32api.h maintainer-clean-warning: $(warning $(MAKE) $(@:%-warning=%)) -- 2.11.0