Commit f54d830b authored by Jeroen Vreeken's avatar Jeroen Vreeken
Browse files

Fix trace dependency on log library

Fix setpoint command include file link
parent 9fcefe48
...@@ -5,8 +5,8 @@ CONSOLE_REL_TAR:=$(CURDIR)/console_$(shell date +%Y%m%d%H%M).tar.gz ...@@ -5,8 +5,8 @@ CONSOLE_REL_TAR:=$(CURDIR)/console_$(shell date +%Y%m%d%H%M).tar.gz
all: all:
$(MAKE) -C common/utils $(MAKE) -C common/utils
$(MAKE) -C common/trace
$(MAKE) -C common/log $(MAKE) -C common/log
$(MAKE) -C common/trace
$(MAKE) -C controller $(MAKE) -C controller
cd libnova-0.13.0 ; ./configure -enable-static -disable-shared --prefix=${CURDIR} ; make; make install cd libnova-0.13.0 ; ./configure -enable-static -disable-shared --prefix=${CURDIR} ; make; make install
$(MAKE) -C console $(MAKE) -C console
...@@ -34,19 +34,20 @@ help: ...@@ -34,19 +34,20 @@ help:
controller: controller:
$(MAKE) -C common/log
$(MAKE) -C common/utils $(MAKE) -C common/utils
$(MAKE) -C common/log
$(MAKE) -C common/trace $(MAKE) -C common/trace
$(MAKE) -C controller $(MAKE) -C controller
console: console:
$(MAKE) -C common/log
$(MAKE) -C common/utils $(MAKE) -C common/utils
$(MAKE) -C common/log
$(MAKE) -C common/trace $(MAKE) -C common/trace
cd libnova-0.13.0 ; ./configure -enable-static -disable-shared --prefix=${CURDIR} ; make; make install cd libnova-0.13.0 ; ./configure -enable-static -disable-shared --prefix=${CURDIR} ; make; make install
$(MAKE) -C console $(MAKE) -C console
clean: clean:
rm -rf common/lib/*
$(MAKE) -C common/log clean $(MAKE) -C common/log clean
$(MAKE) -C common/utils clean $(MAKE) -C common/utils clean
$(MAKE) -C common/trace clean $(MAKE) -C common/trace clean
......
../../controller/controller/controller_setpoint_command.h
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment