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

fix some makefile dependencies

parent 8a082acf
......@@ -8,7 +8,7 @@ LIBNOVA=-lnova -L../../lib/
RELEASE_FILE=../../release/console.tar.gz
all: aalib predictlib\
all: lib/libaa.la lib/libpredict.la \
setpoint.o console_easycomm console_joystick command_shell \
spg_list spg_log_parser \
console_moontracker \
......@@ -43,7 +43,7 @@ spg_list: spg_list.o
spg_log_parser: spg_log_parser.o
console_moontracker_LDFLAGS= -lm -lpthread -laa
console_moontracker: console_moontracker.o setpoint.o
console_moontracker: console_moontracker.o setpoint.o lib/libaa.la
console_j2000tracker_LDFLAGS=$(LIBNOVA) -lpthread -lm
console_j2000tracker: console_j2000tracker.o setpoint.o
......@@ -59,7 +59,7 @@ console_azel: console_azel.o setpoint.o
console_manual: console_manual.o setpoint.o
console_suntracker_LDFLAGS= -lm -lpthread -laa
console_suntracker: console_suntracker.o setpoint.o
console_suntracker: console_suntracker.o setpoint.o lib/libaa.la
console_idle: console_idle.o setpoint.o
......@@ -83,7 +83,7 @@ log_proxy: log_proxy.o
spg_auth: spg_auth.o setpoint.o
console_sattracker_LDFLAGS= -lpthread $(LIBNOVA) -lm -lpredict
console_sattracker: console_sattracker.o setpoint.o
console_sattracker: console_sattracker.o setpoint.o lib/libpredict.la
command.cgi: command.cgi.o
......@@ -103,19 +103,19 @@ status.cgi_install: status.cgi
@echo " CP status.cgi"
@cp status.cgi ../htdocs
aalib:
lib/libaa.la:
@$(MAKE) -C aalib
doc:
@$(MAKE) -C doc
predictlib:
lib/libpredict.la:
@$(MAKE) -C predictlib
.PHONY: aalib doc predictlib
.PHONY: doc
clean:
rm -f *.o *.d
rm -rf *.o *.d lib/* *.lo *.a *.la .libs
rm -f \
command_shell \
console_joystick \
......
......@@ -30,7 +30,7 @@ test-003_LDFLAGS= -lpredict
test-003: test-003.o libpredict.la_install
clean:
rm -rf *.o *.a *.d test-001 test-002 test-003 *.lo *.la libs
rm -rf *.o *.a *.d test-001 test-002 test-003 *.lo *.la .libs
SRCS=$(LIBSRCS) $(TESTSRCS)
......
......@@ -20,7 +20,7 @@ all: dt_ctrl dt_ctrl_sim \
controller
dt_ctrl: lib/libcontroller.la lib/libethercat.la lib/libdt_azimuth.la lib/libdt_elevation.la
dt_ctrl_sim: lib/libcontroller.la lib/libdt_azimuth.la lib/libdt_elevation.la
dt_ctrl_sim: lib/libcontroller.la lib/libethercat.la lib/libdt_azimuth.la lib/libdt_elevation.la
lib/libethercat.la: lib/libcontroller.la
lib/libdt_azimuth.la: lib/libcontroller.la
......@@ -34,7 +34,7 @@ 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
test:
test: lib/libcontroller.la lib/libethercat.la lib/liblog.la
@echo " SUBDIR: $@"
@$(MAKE) -C test
......
......@@ -35,8 +35,8 @@ ec_enum: ec_enum.o
ec_enum.o: esc_id.h
ec_el_test_LDFLAGS:= `../controller/block_list.sh ../lib/lib*.a` -Wl,-E -lcontroller -lethercat -llog -lshell
ec_el_test: ec_el_test.o
ec_el_test_LDFLAGS:= `../controller/block_list.sh ../lib/lib*.a` -Wl,-E -lcontroller -lethercat -llog
ec_el_test: ec_el_test.o libethercat.la_install
clean:
rm -rf *.o *.a *.la *.lo .libs *.d ec_enum ec_el_test
......
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