From 5f8b579b46da948871b027748ef7beedc528ae14 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Thu, 11 Dec 2014 06:49:02 -0800 Subject: * configure (have_git): New variable and configure test for git. * Makefile (SRCS): Only set if git is available. (enforce): Fail if we don't have git. --- ChangeLog | 7 +++++++ Makefile | 8 ++++++++ configure | 14 ++++++++++++++ 3 files changed, 29 insertions(+) diff --git a/ChangeLog b/ChangeLog index 00fd4316..b457d440 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2014-12-11 Kaz Kylheku + + * configure (have_git): New variable and configure test for git. + + * Makefile (SRCS): Only set if git is available. + (enforce): Fail if we don't have git. + 2014-12-10 Kaz Kylheku Throwing away old dependency system. diff --git a/Makefile b/Makefile index 56169677..2e762ff3 100644 --- a/Makefile +++ b/Makefile @@ -45,11 +45,14 @@ OBJS += arith.o hash.o utf8.o filter.o eval.o rand.o combi.o sysif.o OBJS-$(debug_support) += debug.o OBJS-$(have_syslog) += syslog.o OBJS-$(have_posix_sigs) += signal.o + +ifneq ($(have_git),) SRCS := $(addprefix $(top_srcdir)/,\ $(filter-out lex.yy.c y.tab.c y.tab.h,\ $(shell git --work-tree=$(top_srcdir) \ --git-dir=$(top_srcdir)/.git \ ls-files "*.c" "*.h" "*.l" "*.y"))) +endif # MPI objects MPI_OBJ_BASE=mpi.o mplogic.o @@ -233,9 +236,14 @@ endef .PHONY: enforce enforce: +ifneq ($(have_git),) $(call GREP_CHECK,'\ conftest.err 2>&1 } +# +# Check for git because we use it out of the Makefile +# +printf "Checking whether we have git ... " + +if git --version > /dev/null 2> /dev/null ; then + have_git=y + printf "yes\n" +else + printf "missing\n" +fi # # Check C compiler sanity -- cgit v1.2.3