support make goals after initial {'', dist, data}clean goal(s)

Now make goal combinations starting with *clean goals,
ending with *clean coals, and having non-*clean goals in between
should work. What does not expected to work are
non-*clean - *clean - *non-clean goal combinations.

Also, if first goals are *clean goals, re-creation of Makefile.config
is inhibited when Makefile.config exists and ./configure is newer.
This commit is contained in:
Tomi Ollila 2017-01-16 20:04:48 +02:00 committed by David Bremner
parent ed22cd8bf1
commit ae05839028

View file

@ -22,7 +22,35 @@ include Makefile.config
global_deps = Makefile Makefile.config Makefile.local \ global_deps = Makefile Makefile.config Makefile.local \
$(subdirs:%=%/Makefile) $(subdirs:%=%/Makefile.local) $(subdirs:%=%/Makefile) $(subdirs:%=%/Makefile.local)
INCLUDE_MORE := yes
ifneq ($(filter clean distclean dataclean, $(word 1, $(MAKECMDGOALS))),)
CLEAN_GOAL := $(word 1, $(MAKECMDGOALS))
# If there are more goals following CLEAN_GOAL, run $(MAKE)s in parts.
ifneq ($(word 2, $(MAKECMDGOALS)),)
INCLUDE_MORE := no
FOLLOWING_GOALS := $(wordlist 2, 99, $(MAKECMDGOALS))
.PHONY: $(FOLLOWING_GOALS) make_in_parts
$(FOLLOWING_GOALS):
@true
$(CLEAN_GOAL): make_in_parts
make_in_parts:
$(MAKE) $(CLEAN_GOAL)
$(MAKE) $(FOLLOWING_GOALS) configure_options="$(configure_options)"
endif
else
CLEAN_GOAL :=
endif
# Potentially speedup make clean, distclean and dataclean ; avoid
# re-creating Makefile.config if it exists but configure is newer.
ifneq ($(CLEAN_GOAL),)
Makefile.config: | $(srcdir)/configure
else
Makefile.config: $(srcdir)/configure Makefile.config: $(srcdir)/configure
endif
ifeq ($(configure_options),) ifeq ($(configure_options),)
@echo "" @echo ""
@echo "Note: Calling ./configure with no command-line arguments. This is often fine," @echo "Note: Calling ./configure with no command-line arguments. This is often fine,"
@ -33,9 +61,11 @@ ifeq ($(configure_options),)
endif endif
$(srcdir)/configure $(configure_options) $(srcdir)/configure $(configure_options)
ifeq ($(INCLUDE_MORE),yes)
# runtime variable definitions available in all subdirs # runtime variable definitions available in all subdirs
include $(srcdir)/Makefile.global include $(srcdir)/Makefile.global
# Finally, include all of the Makefile.local fragments where all the # Finally, include all of the Makefile.local fragments where all the
# real work is done. # real work is done.
include $(subdirs:%=%/Makefile.local) Makefile.local include $(subdirs:%=%/Makefile.local) Makefile.local
endif