X-Git-Url: http://plrg.eecs.uci.edu/git/?p=folly.git;a=blobdiff_plain;f=folly%2FMakefile.am;h=3d5fd9ba5816c27af5a3a18f6445d07fe098fc52;hp=4bde2ae3ee190ef3bc6e023f105bde10f13c29c2;hb=507086879c31e0918c94e96fc696fac2501cc001;hpb=833ecbf035d548fa3a631c7191cc4ec23b738d05

diff --git a/folly/Makefile.am b/folly/Makefile.am
index 4bde2ae3..3d5fd9ba 100644
--- a/folly/Makefile.am
+++ b/folly/Makefile.am
@@ -1,9 +1,14 @@
 if FOLLY_TESTMAIN
-SUBDIRS = . experimental init test io/test experimental/io/test
-else
-SUBDIRS = . experimental test io/test experimental/io/test
+MAYBE_INIT = init
 endif
 
+if EXCEPTION_TRACER
+MAYBE_EXCEPTION_TRACER = experimental/exception_tracer
+endif
+
+SUBDIRS = . experimental $(MAYBE_INIT) test io/test experimental/io/test \
+	  $(MAYBE_EXCEPTION_TRACER)
+
 ACLOCAL_AMFLAGS = -I m4
 
 CLEANFILES =
@@ -109,6 +114,11 @@ nobase_follyinclude_HEADERS = \
 	experimental/EventCount.h \
 	experimental/Instructions.h \
 	experimental/bser/Bser.h \
+	experimental/exception_tracer/ExceptionAbi.h \
+	experimental/exception_tracer/ExceptionCounterLib.h \
+	experimental/exception_tracer/ExceptionTracer.h \
+	experimental/exception_tracer/ExceptionTracerLib.h \
+	experimental/exception_tracer/StackTrace.h \
 	experimental/FunctionScheduler.h \
 	experimental/FutureDAG.h \
 	experimental/io/FsUtil.h \