Have console in its own directory

Makefile

-include build.mk
-
-CFLAGS= -Wall -O3 \
-	-I. \
-	-Icontroller \
-	-Iutils \
-	-Itrace \
-	-Idt_azimuth -Idt_elevation -Iec -Ishell -Ilog
-LDFLAGS= -lpthread -lrt -lm -ldl -Wl,-E
-CFLAGS_SIM=-DUSE_AZ_SIM -DUSE_EL_SIM
-
-ARCHIVES= \
-	dt_azimuth/dt_azimuth.a \
-	dt_elevation/dt_elevation.a \
-	controller/controller.a \
-	log/log.a \
-	ec/ec.a \
-	shell/shell.a \
-	trace/trace.a \
-	utils/utils.a
-
-dt_ctrl_sim_LDFLAGS=`controller/block_list.sh dt_azimuth/dt_azimuth.a dt_elevation/dt_elevation.a controller/controller.a`
-dt_ctrl_LDFLAGS=$(dt_ctrl_sim_LDFLAGS) `controller/block_list.sh ec/ec.a`
-
-all: trace/trace.a utils/utils.a console \
-	dt_ctrl dt_ctrl_sim \
-	trace_list trace_view \
-	test
-
-dt_ctrl: dt_ctrl.o $(ARCHIVES)
-
-dt_ctrl_sim: dt_ctrl_sim.o  $(ARCHIVES)
-
-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: trace_list.o $(ARCHIVES)
-
-trace_view: trace_view.o $(ARCHIVES)
-
-%.a:
-	@echo " SUBDIR: $(@D)"
-	@$(MAKE) -C $(@D)
-
-ec/ec.a: log/log.a shell/shell.a
-
-trace/trace.a: utils/utils.a
-
-winrotor-usb:
-	@echo " SUBDIR: $@"
-	@$(MAKE) -C winrotor-usb
-	
-test:
-	@echo " SUBDIR: $@"
-	@$(MAKE) -C test
-
-console:
-	@echo " SUBDIR: $@"
-	@$(MAKE) -C console
-
-.PHONY: utils trace console winrotor-usb test
-
-clean:
-	rm -f *.o *.d
-	rm -f dt_az dt_az_ctrl \
-	    command_shell \
-	    trace_list trace_view \
-	    dt_ctrl \
-	    dt_ctrl_sim
-	$(MAKE) -C controller clean
-	$(MAKE) -C console clean
-	$(MAKE) -C utils clean
-	$(MAKE) -C trace clean
-	$(MAKE) -C dt_azimuth clean
-	$(MAKE) -C dt_elevation clean
-	$(MAKE) -C winrotor-usb clean
-	$(MAKE) -C ec clean
-	$(MAKE) -C test clean
-	$(MAKE) -C shell clean
-	$(MAKE) -C log clean

console/Makefile

-include ../build.mk
+include build.mk
 
-CFLAGS= -Wall -g -I../utils -I../controller -Iaalib -Ipredictlib -I../trace
-ARCHIVES= ../utils/utils.a aalib/aalib.a predictlib/predictlib.a ../trace/trace.a
-		
-all: aalib predictlib\
-	setpoint.o console_easycomm console_joystick command_shell \
-	spg_list spg_log_parser \
-	console_moontracker \
-	console_httptrace console_httpline console_httpline_install \
-	trace_proxy trace_line_install trace_log \
-	console_j2000tracker console_j2000tracer console_j2000_indi \
-	log_proxy spg_auth console_idle console_zenith \
-	console_suntracker console_azel console_manual \
-	console_weather \
-	await_controller \
-	console_sattracker
+CFLAGS= -Wall -O3 \
+	-I. \
+	-Icontroller \
+	-I../common/utils \
+	-I../common/trace \
+	-I../common/include \
+	-Idt_azimuth -Idt_elevation -Iec -Ishell -Ilog
+LDFLAGS= -lpthread -lrt -lm -ldl -Wl,-E
+CFLAGS_SIM=-DUSE_AZ_SIM -DUSE_EL_SIM
 
-await_controller: await_controller.o $(ARCHIVES)
+ARCHIVES= \
+	dt_azimuth/dt_azimuth.a \
+	dt_elevation/dt_elevation.a \
+	controller/controller.a \
+	log/log.a \
+	ec/ec.a \
+	shell/shell.a \
+	../common/trace/trace.a \
+	../common/utils/utils.a
 
-console_easycomm: console_easycomm.o setpoint.o $(ARCHIVES)
+dt_ctrl_sim_LDFLAGS=`controller/block_list.sh dt_azimuth/dt_azimuth.a dt_elevation/dt_elevation.a controller/controller.a`
+dt_ctrl_LDFLAGS=$(dt_ctrl_sim_LDFLAGS) `controller/block_list.sh ec/ec.a`
 
-console_httpline: console_httpline.o $(ARCHIVES)
+all: console 
 
-console_httpline_install: console_httpline
-	@echo "   CP  console_httpline"
-	@cp console_httpline ../htdocs
+%.a:
+	@echo " SUBDIR: $(@D)"
+	@$(MAKE) -C $(@D)
 
-console_httptrace: console_httptrace.o $(ARCHIVES)
 
-console_joystick: console_joystick.o setpoint.o $(ARCHIVES)
 
-command_shell: command_shell.o setpoint.o $(ARCHIVES)
+winrotor-usb:
+	@echo " SUBDIR: $@"
+	@$(MAKE) -C winrotor-usb
+	
 
-spg_list: spg_list.o $(ARCHIVES)
+console:
+	@echo " SUBDIR: $@"
+	@$(MAKE) -C console
 
-spg_log_parser: spg_log_parser.o $(ARCHIVES)
-
-console_moontracker: console_moontracker.o setpoint.o $(ARCHIVES) -lm -lpthread
-
-console_j2000tracker: console_j2000tracker.o setpoint.o $(ARCHIVES) -lnova -lpthread -lm
-
-console_j2000tracer: console_j2000tracer.o $(ARCHIVES) -lnova
-
-console_j2000_indi: console_j2000_indi.o $(ARCHIVES) -lindi -lindidriver -lm
-
-console_azel: console_azel.o setpoint.o $(ARCHIVES)
-
-console_manual: console_manual.o setpoint.o $(ARCHIVES)
-
-console_suntracker: console_suntracker.o setpoint.o $(ARCHIVES) -lm -lpthread
-
-console_idle: console_idle.o setpoint.o $(ARCHIVES)
-
-console_weather: console_weather.o $(ARCHIVES) -lpthread
-
-console_zenith: console_zenith.o setpoint.o $(ARCHIVES)
-
-trace_proxy: trace_proxy.o $(ARCHIVES)
-
-trace_line: trace_line.o $(ARCHIVES)
-
-trace_line_install: trace_line
-	@echo "   CP  trace_line"
-	@cp trace_line ../htdocs
-
-
-trace_log: trace_log.o $(ARCHIVES)
-
-log_proxy: log_proxy.o $(ARCHIVES)
-
-spg_auth: spg_auth.o setpoint.o $(ARCHIVES)
-
-console_sattracker: console_sattracker.o setpoint.o $(ARCHIVES) -lpthread -lnova -lm
-
-aalib:
-	@$(MAKE) -C aalib
-
-doc:
-	@$(MAKE) -C doc
-
-predictlib:
-	@$(MAKE) -C predictlib
-
-.PHONY: aalib doc predictlib
+.PHONY: console
 
 clean:
 	rm -f *.o *.d
-	rm -f \
-	    command_shell \
-	    console_joystick \
-	    console_easycomm \
-	    spg_list \
-	    console_httptrace \
-	    console_httpline \
-	    trace_proxy \
-	    console_manual \
-	    console_moontracker \
-	    console_suntracker \
-	    console_j2000tracker \
-	    console_j2000tracer \
-	    console_j2000_indi \
-	    console_azel \
-	    console_idle \
-	    console_sattracker \
-	    console_weather \
-	    console_zenith \
-	    trace_proxy \
-	    trace_line \
-	    trace_log \
-	    log_proxy \
-	    spg_auth \
-	    spg_log_parser \
-	    await_controller
-	$(MAKE) -C aalib clean
-	$(MAKE) -C doc clean
-	$(MAKE) -C predictlib clean
-
+	$(MAKE) -C console clean
+	$(MAKE) -C winrotor-usb clean

console/README

+Directories:
+
+	console		Console utilities
+
+	winrotor-usb	Winrotor-USB control block
+
+Programs:
+
+	command_shell	Command line tool to send commands to a setpoint 
+			generator.
+
+	console_easycomm Control (and view) the controller DT with easycomm.
+
+	console_joystick Control the DT with a joystick.
+	
+	console_moontracker Track the moon.
+	
+	spg_list	List all available setpoint generators

console/console/Makefile

+include ../build.mk
+
+CFLAGS= -Wall -g -I../../common/utils -I../controller -Iaalib -Ipredictlib -I../../common/trace -I../../common/include
+ARCHIVES= ../../common/utils/utils.a aalib/aalib.a predictlib/predictlib.a ../../common/trace/trace.a
+		
+all: aalib predictlib\
+	setpoint.o console_easycomm console_joystick command_shell \
+	spg_list spg_log_parser \
+	console_moontracker \
+	console_httptrace console_httpline console_httpline_install \
+	trace_proxy trace_line_install trace_log \
+	console_j2000tracker console_j2000tracer console_j2000_indi \
+	log_proxy spg_auth console_idle console_zenith \
+	console_suntracker console_azel console_manual \
+	console_weather \
+	await_controller \
+	console_sattracker
+
+await_controller: await_controller.o $(ARCHIVES)
+
+console_easycomm: console_easycomm.o setpoint.o $(ARCHIVES)
+
+console_httpline: console_httpline.o $(ARCHIVES)
+
+console_httpline_install: console_httpline
+	@echo "   CP  console_httpline"
+	@cp console_httpline ../htdocs
+
+console_httptrace: console_httptrace.o $(ARCHIVES)
+
+console_joystick: console_joystick.o setpoint.o $(ARCHIVES)
+
+command_shell: command_shell.o setpoint.o $(ARCHIVES)
+
+spg_list: spg_list.o $(ARCHIVES)
+
+spg_log_parser: spg_log_parser.o $(ARCHIVES)
+
+console_moontracker: console_moontracker.o setpoint.o $(ARCHIVES) -lm -lpthread
+
+console_j2000tracker: console_j2000tracker.o setpoint.o $(ARCHIVES) -lnova -lpthread -lm
+
+console_j2000tracer: console_j2000tracer.o $(ARCHIVES) -lnova
+
+console_j2000_indi: console_j2000_indi.o $(ARCHIVES) -lindi -lindidriver -lm
+
+console_azel: console_azel.o setpoint.o $(ARCHIVES)
+
+console_manual: console_manual.o setpoint.o $(ARCHIVES)
+
+console_suntracker: console_suntracker.o setpoint.o $(ARCHIVES) -lm -lpthread
+
+console_idle: console_idle.o setpoint.o $(ARCHIVES)
+
+console_weather: console_weather.o $(ARCHIVES) -lpthread
+
+console_zenith: console_zenith.o setpoint.o $(ARCHIVES)
+
+trace_proxy: trace_proxy.o $(ARCHIVES)
+
+trace_line: trace_line.o $(ARCHIVES)
+
+trace_line_install: trace_line
+	@echo "   CP  trace_line"
+	@cp trace_line ../htdocs
+
+
+trace_log: trace_log.o $(ARCHIVES)
+
+log_proxy: log_proxy.o $(ARCHIVES)
+
+spg_auth: spg_auth.o setpoint.o $(ARCHIVES)
+
+console_sattracker: console_sattracker.o setpoint.o $(ARCHIVES) -lpthread -lnova -lm
+
+aalib:
+	@$(MAKE) -C aalib
+
+doc:
+	@$(MAKE) -C doc
+
+predictlib:
+	@$(MAKE) -C predictlib
+
+.PHONY: aalib doc predictlib
+
+clean:
+	rm -f *.o *.d
+	rm -f \
+	    command_shell \
+	    console_joystick \
+	    console_easycomm \
+	    spg_list \
+	    console_httptrace \
+	    console_httpline \
+	    trace_proxy \
+	    console_manual \
+	    console_moontracker \
+	    console_suntracker \
+	    console_j2000tracker \
+	    console_j2000tracer \
+	    console_j2000_indi \
+	    console_azel \
+	    console_idle \
+	    console_sattracker \
+	    console_weather \
+	    console_zenith \
+	    trace_proxy \
+	    trace_line \
+	    trace_log \
+	    log_proxy \
+	    spg_auth \
+	    spg_log_parser \
+	    await_controller
+	$(MAKE) -C aalib clean
+	$(MAKE) -C doc clean
+	$(MAKE) -C predictlib clean
+