From 2fc1758ac8ca78ba14014e91561df4d9d0880158 Mon Sep 17 00:00:00 2001 From: Stefan Ritt Date: Wed, 1 Oct 2014 08:59:31 +0200 Subject: [PATCH] Ignore git-revision.h in GIT repository --- .gitignore | 1 + Makefile | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index abbfc6e1..926b13e4 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ elog # Logbook generated files logbooks/* locext +git-revision.h diff --git a/Makefile b/Makefile index d05719fc..ddafe5de 100644 --- a/Makefile +++ b/Makefile @@ -106,7 +106,7 @@ ifeq ($(WHOAMI),root) BINFLAGS = -o ${BINOWNER} -g ${BINGROUP} endif -all: $(EXECS) $(GIT_REVISION) +all: $(EXECS) # put current GIT revision into header file to be included by programs $(GIT_REVISION): src/elogd.c @@ -127,7 +127,7 @@ mxml.o: $(MXMLDIR)/mxml.c $(MXMLDIR)/mxml.h strlcpy.o: $(MXMLDIR)/strlcpy.c $(MXMLDIR)/strlcpy.h $(CC) $(CFLAGS) -c -o strlcpy.o $(MXMLDIR)/strlcpy.c -elogd: src/elogd.c regex.o crypt.o auth.o mxml.o +elogd: src/elogd.c regex.o crypt.o auth.o mxml.o $(GIT_REVISION) $(CC) $(CFLAGS) -o elogd src/elogd.c crypt.o auth.o regex.o mxml.o $(OBJS) $(LIBS) elog: src/elog.c crypt.o $(OBJS)