From d9b522cd0bd7af79b0783b1ce7ed88fd2b0f3b31 Mon Sep 17 00:00:00 2001 From: Kevin Easton Date: Tue, 2 Aug 2016 23:29:10 +1000 Subject: [PATCH] Add back Makefile rules to create .config.h This fixes a bug introduced in commit f2ae2327, which improved the Makefiles for parallel builds but in doing so removed the rule to create an empty .config.h file. .config.h isn't included in the source distribution - it's created by bxconfigure if you run it. If you don't run it, the build systems needs to create an empty one. This commit adds a rule to both the toplevel Makefile.in and source/Makefile.in (the latter in case you're running 'make' just in the source/ directory). The toplevel one is required for building the modules tree under dll/, since the module Makefiles don't have the right dependencies wired up. This also makes 'distclean' remove the .config.h file. --- Makefile.in | 9 ++++++--- source/Makefile.in | 3 +++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index 6db4d28..8967b67 100644 --- a/Makefile.in +++ b/Makefile.in @@ -187,6 +187,9 @@ all: source_all dll @echo else you can type \"$(MAKE_BIN) install_local\" to install $(_VERSION_) to your home @echo directory. +.config.h: + touch $@ + install: all installbin installdll installscript installman installhelp \ installtranslation reallydone @@ -194,13 +197,13 @@ installeverything: install everything: all -source_all: +source_all: .config.h @cd source && $(MAKE) all -$(_VERSION_): +$(_VERSION_): .config.h @cd source && $(MAKE) $(_VERSION_) -dll: +dll: .config.h @cd dll && $(MAKE) all installdll: $(srcdir)/Makefile dll/Makefile installdirs dll diff --git a/source/Makefile.in b/source/Makefile.in index 83e90c2..97f99f9 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -173,6 +173,9 @@ SOURCES = $(OBJECTS:%.o=%.c) #$(TCL_SRCS) all: $(_VERSION_) wserv scr-bx +../include/../.config.h: + touch $@ + Makefile: $(srcdir)/Makefile.in cd $(topdir) \ && $(SHELL) ./config.status