From 05689cf442054a06952f3948cdbfb7f071114dad Mon Sep 17 00:00:00 2001 From: Ron Date: Sun, 9 Jun 2013 03:26:59 +0930 Subject: [PATCH 1/9] Don't build the tools by default You can build them all with `make tools` or individually with `make tools/foo`. Using `make clean` will still remove them. --- Makefile.am | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index c2a1b18..48b757e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -135,7 +135,7 @@ daalainclude_HEADERS = \ # Tools -noinst_PROGRAMS += \ +tools_TARGETS = \ tools/png2y4m \ tools/y4m2png \ tools/dump_psnrhvs \ @@ -171,6 +171,9 @@ noinst_HEADERS += \ tools/trans_tools.h \ tools/vidinput.h +EXTRA_PROGRAMS = $(tools_TARGETS) +CLEANFILES = $(tools_TARGETS) + # png2y4m tools_png2y4m_SOURCES = \ tools/kiss99.c \ @@ -465,7 +468,7 @@ FIG_OBJS = \ #noinst_DATA = mc.pdf -CLEANFILES = \ +CLEANFILES += \ doc/mc.pdf \ doc/mc.out \ doc/mc.log \ @@ -527,6 +530,8 @@ daala install-daala: NO_DOXYGEN = 1 daala: all install-daala: install +tools: $(tools_TARGETS) + # Or just the docs docs: doc/doxygen-build.stamp -- 1.7.2.5