move trace tools to trace dir

common/build.mk

@@ -14,7 +14,7 @@ LIBTOOL=libtool
 
 %: %.o
 	@echo "     LD $@"
-	@${LIBTOOL} --quiet --mode=link --tag=CC $(LINK.o) $^ $(LOADLIBS) $(LDLIBS) $($@_LDFLAGS) -o $@
+	@${LIBTOOL} --quiet --mode=link --tag=CC $(LINK.o) $(filter %.o,$^) $(LOADLIBS) $(LDLIBS) $($@_LDFLAGS) -o $@
 
 %.lo: %.c
 	@echo "LT   CC $<"

common/trace/.gitignore

 trace_dump
 trace_dumpdiff
 trace_fft
+trace_list
+trace_view

common/trace/Makefile

@@ -11,7 +11,7 @@ libs: libtrace.la
 
 libs_install: libtrace.la_install
 
-bins: libs libs_install trace_dump trace_dumpdiff trace_fft
+bins: trace_dump trace_dumpdiff trace_fft trace_view trace_list
 
 ${CURDIR}/../lib:
 	@mkdir ${CURDIR}/../lib
@@ -24,15 +24,23 @@ libtrace.la_install: libtrace.la ${CURDIR}/../lib
 	@${LIBTOOL} --quiet --mode=install install libtrace.la ${CURDIR}/../lib
 
 trace_dump_LDFLAGS= -ltrace -lutils
-trace_dump: trace_dump.o
+trace_dump: trace_dump.o libs_install
 
 trace_dumpdiff_LDFLAGS= -ltrace -lutils
-trace_dumpdiff: trace_dumpdiff.o
+trace_dumpdiff: trace_dumpdiff.o libs_install
+
+trace_fft_LDFLAGS= -lm -lutils -ltrace -lfftw3
+trace_fft: trace_fft.o libs_install
+
+trace_list_LDFLAGS= -ltrace
+trace_list: trace_list.o libs_install
+
+trace_view_LDFLAGS= -ltrace
+trace_view: trace_view.o libs_install
 
-trace_fft_LDFLAGS= -lm -lutils -ltrace
-trace_fft: trace_fft.o -lfftw3
 
 clean:
-	rm -rf *.o *.a *.d *.lo *.la .libs trace_dump trace_dumpdiff trace_fft
+	rm -rf *.o *.a *.d *.lo *.la .libs \
+	    trace_dump trace_dumpdiff trace_fft trace_list trace_view
 
 include ../build.mk

controller/.gitignore

 dt_ctrl
 dt_ctrl_sim
-trace_list
-trace_view
 dt_ctrl.dot
 dt_ctrl.pdf

controller/Makefile

@@ -16,7 +16,6 @@ dt_ctrl_sim_LDFLAGS=`controller/block_list.sh lib/*.a` \
 dt_ctrl_LDFLAGS=$(dt_ctrl_sim_LDFLAGS)
 
 all: dt_ctrl dt_ctrl_sim \
-	trace_list trace_view \
 	test \
 	controller
 
@@ -35,12 +34,6 @@ dt_ctrl_sim.o: dt_ctrl.c
 	@echo "COMPILE: dt_ctrl.c (OUTPUT: dt_ctrl_sim.o)"
 	@$(CC) $(CFLAGS) $(CFLAGS_SIM) dt_ctrl.c -c -o dt_ctrl_sim.o
 
-trace_list_LDFLAGS= -ltrace
-trace_list: trace_list.o
-
-trace_view_LDFLAGS= -ltrace
-trace_view: trace_view.o
-
 test:
 	@echo " SUBDIR: $@"
 	@$(MAKE) -C test
@@ -82,7 +75,6 @@ clean:
 	rm -f *.o *.d *.a *.la *.lo lib/*
 	rm -f dt_az dt_az_ctrl \
 	    command_shell \
-	    trace_list trace_view \
 	    dt_ctrl \
 	    dt_ctrl_sim
 	$(MAKE) -C controller clean