From 087c2fd078c64f75baffd72d7b2a735459c7442f Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Wed, 4 Nov 2015 11:22:56 +0800 Subject: [PATCH] runtime: fix generation of service_table.h --- .gitignore | 1 - artiq/runtime/Makefile | 7 +++++-- artiq/runtime/services.c | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 83bcf3a24..950cbbedb 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,6 @@ __pycache__ *.bin *.elf *.fbi -artiq/runtime/service_table.h doc/manual/_build /build /dist diff --git a/artiq/runtime/Makefile b/artiq/runtime/Makefile index cb3dd41e9..476d4ab3f 100644 --- a/artiq/runtime/Makefile +++ b/artiq/runtime/Makefile @@ -6,7 +6,7 @@ PYTHON ?= python3 OBJECTS := isr.o flash_storage.o clock.o rtiocrg.o elf_loader.o services.o session.o log.o test_mode.o kloader.o bridge_ctl.o mailbox.o ksupport_data.o net_server.o moninj.o main.o OBJECTS_KSUPPORT := ksupport.o exception_jmp.o exceptions.o mailbox.o bridge.o rtio.o ttl.o dds.o -CFLAGS += -I$(LIBLWIP_DIRECTORY)/../lwip/src/include -I$(LIBLWIP_DIRECTORY) +CFLAGS += -I$(LIBLWIP_DIRECTORY)/../lwip/src/include -I$(LIBLWIP_DIRECTORY) -I. all: runtime.bin runtime.fbi @@ -45,7 +45,10 @@ ksupport_data.o: ksupport.bin service_table.h: ksupport.elf $(RUNTIME_DIRECTORY)/gen_service_table.py @echo " GEN " $@ && $(PYTHON) $(RUNTIME_DIRECTORY)/gen_service_table.py ksupport.elf > $@ -services.c: service_table.h +$(RUNTIME_DIRECTORY)/services.c: service_table.h + +services.o: $(RUNTIME_DIRECTORY)/services.c service_table.h + $(compile) main.o: $(RUNTIME_DIRECTORY)/main.c $(compile) diff --git a/artiq/runtime/services.c b/artiq/runtime/services.c index 74bdeef71..39db8537b 100644 --- a/artiq/runtime/services.c +++ b/artiq/runtime/services.c @@ -8,7 +8,7 @@ #include "exceptions.h" #include "services.h" -#include "service_table.h" +#include #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wimplicit-int"