about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2013-06-15 21:48:18 +0000
committerEric Wong <normalperson@yhbt.net>2013-06-18 09:52:19 +0000
commit3ccb31387d610da6525c464015f7688e71901ea5 (patch)
tree052593082e2bbbfba8593d8449df25cbfc6c4025
parent12295396f592bbdebb27033e2b34917dd8cfaf37 (diff)
downloadcmogstored-3ccb31387d610da6525c464015f7688e71901ea5.tar.gz
Our tests over-link (to save developer time :P), so we must
link in probes with our tests.  Also, we must keep probes.h
around for distclean (but not maintainerclean)
-rw-r--r--Makefile.am6
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 14cfedd..cd2f800 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,7 @@ ACLOCAL_AMFLAGS = -I m4
 AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib
 AM_CFLAGS = $(WARN_CFLAGS) $(GCC_ATOMICS_CFLAGS) $(PTHREAD_CFLAGS)
 AM_LDFLAGS = $(LIBGNU_LIBDEPS) $(LIB_CLOCK_GETTIME)
+DTRACE = @DTRACE@
 SUBDIRS = lib
 
 # slow.mk is auto-generated by the maintainer (see GNUmakefile)
@@ -148,7 +149,7 @@ $(PERL_TESTS:.perl=.log):: $(bin_PROGRAMS) $(test_tmpdir)/.stamp
 $(test_tmpdir)/.stamp:
         @mkdir -p $(test_tmpdir) && > $@
 
-test_COMMON = $(mog_src) $(RL_CGEN) check.h
+test_COMMON = $(mog_src) $(RL_CGEN) check.h probes.d
 
 test_valid_path_1_SOURCES = test/valid-path-1.c $(test_COMMON)
 test_trywrite_1_SOURCES = test/trywrite-1.c $(test_COMMON)
@@ -225,12 +226,13 @@ dist-hook:
         echo $(VERSION) > $(distdir)/.tarball-version
 
 if ENABLE_SYSTEMTAP
-BUILT_SOURCES += probes.h
 probes.h: probes.d
         $(DTRACE) -C -h -s $< -o $@
 
 probes.o: probes.d
         $(DTRACE) -C -G -s $< -o $@
 
+EXTRA_DIST += probes.h
+BUILT_SOURCES += probes.h
 LDADD += probes.o
 endif