about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2012-01-12 02:02:07 +0000
committerEric Wong <normalperson@yhbt.net>2012-01-12 02:02:07 +0000
commit13d6c72e5695edd482c44ebb6282f845e86ae08d (patch)
tree609e701c53b6d0b9a2283f32531c394aa1468691
parent252b0eaf8535a0edbb3f657f3c1a24df25701bb7 (diff)
downloadcmogstored-13d6c72e5695edd482c44ebb6282f845e86ae08d.tar.gz
It's standardized by Automake.
-rw-r--r--Makefile.am5
-rw-r--r--coverage.mk4
2 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index f8ffef1..16861a4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -65,6 +65,7 @@ RL_MAIN = cfg_parser.rl iostat_parser.rl listen_parser.rl mgmt_parser.rl \
           valid_path.rl
 RL_CGEN = cfg_parser.c  iostat_parser.c  listen_parser.c  mgmt_parser.c \
           valid_path.c
+BUILT_SOURCES = $(RL_CGEN)
 RL_ALL = listen_parser_common.rl $(RL_MAIN)
 
 cfg_parser.c: cfg_parser.rl listen_parser_common.rl
@@ -74,7 +75,7 @@ listen_parser.c: listen_parser.rl listen_parser_common.rl
         $(AM_V_GEN)$(RAGEL) $< -C $(RLFLAGS) -o $@
 
 bin_PROGRAMS = cmogstored
-cmogstored_SOURCES = $(mog_src) $(RL_CGEN) cmogstored.c
+cmogstored_SOURCES = $(mog_src) $(BUILT_SOURCES) cmogstored.c
 
 TEST_EXTENSIONS = .rb
 RB_LOG_COMPILER = $(top_srcdir)/test/ruby-parallel.sh
@@ -87,7 +88,7 @@ check_PROGRAMS = test/valid-path-1 test/trywrite-1 \
 
 TESTS = $(RB_TESTS) $(check_PROGRAMS)
 
-test_COMMON = $(mog_src) $(RL_CGEN) check.h
+test_COMMON = $(mog_src) $(BUILT_SOURCES) check.h
 
 test_valid_path_1_SOURCES = test/valid-path-1.c $(test_COMMON)
 test_trywrite_1_SOURCES = test/trywrite-1.c $(test_COMMON)
diff --git a/coverage.mk b/coverage.mk
index 7651359..3ef1a81 100644
--- a/coverage.mk
+++ b/coverage.mk
@@ -4,7 +4,7 @@ GCOV = gcov
 gcovflags = --preserve-paths --branch-probabilities --all-blocks \
   --function-summaries
 .PHONY: coverage-clean coverage-build coverage-show coverage-gen
-cov_src = cmogstored.c $(mog_src) $(RL_CGEN)
+cov_src = cmogstored.c $(mog_src) $(RL_MAIN)
 
 # this doesn't work in out-of-tree builds, yet...
 cover_db = $(top_srcdir)/cover_db
@@ -19,7 +19,7 @@ coverage-build: coverage-clean
           JOBS=1 -j1 $(COVERAGE_CHECK)
         $(MAKE) coverage-gen
 
-COVER_IGNORE = $(addprefix -ignore ,$(RL_CGEN)) -ignore_re ^lib/
+COVER_IGNORE = $(addprefix -ignore ,$(BUILT_SOURCES)) -ignore_re ^lib/
 coverage-show:
         @cover $(COVER_IGNORE) -summary -report text $(cover_db)