From a5f2299675dfe69dc39e667ccd91e6285ecba13d Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Thu, 1 Jan 2015 19:40:18 +0000 Subject: build: Drop ad hoc gitignore generation rules Instead, include Makefile.am.gitignore. (cherry picked from commit 847e3a2c553df8f0a6c78b6c6264a6c77a6e5704) Signed-off-by: Emmanuele Bassi --- tests/interactive/Makefile.am | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am index 4f4c40289..bb935ccdc 100644 --- a/tests/interactive/Makefile.am +++ b/tests/interactive/Makefile.am @@ -71,13 +71,13 @@ endif wrappers: stamp-test-interactive @true -gen-gitignore: Makefile - @(echo "/stamp-test-interactive" ; \ - echo "/stamp-test-unit-names" ; \ - echo "/test-interactive" ; \ - echo "/test-unit-names.h" ; \ - echo "*.o" ; \ - echo ".gitignore" ) > .gitignore +GIT_IGNORE_EXTRA = \ + stamp-test-interactive \ + stamp-test-unit-names \ + test-unit-names.h \ + $(UNIT_TESTS:.c=$(SHEXT)) + +include $(top_srcdir)/build/autotools/Makefile.am.gitignore stamp-test-interactive: Makefile @wrapper=$(abs_builddir)/wrapper.sh ; \ @@ -90,7 +90,6 @@ stamp-test-interactive: Makefile echo "$$wrapper $$test_bin \$$@" \ ) > $$test_bin$(SHEXT) ; \ chmod +x $$test_bin$(SHEXT) ; \ - echo "/$$test_bin$(SHEXT)" >> .gitignore ; \ done \ && echo timestamp > $(@F) @@ -114,7 +113,7 @@ $(top_builddir)/build/win32/test-unit-names.h: test-unit-names.h test-unit-names.h: stamp-test-unit-names @true -stamp-test-unit-names: Makefile gen-gitignore +stamp-test-unit-names: Makefile @( echo "/* ** This file is autogenerated. Do not edit. ** */" ; \ echo "" ; \ echo "const char *test_unit_names[] = {" ) > test-unit-names.h ; \ -- cgit v1.2.1