Generate documentation correctly depending on the selected target

diff --git a/rpp-lib b/rpp-lib
index ab932b46eaec6a8a4253c36454d75ee4fd0a00ff..bcc51b05171e724172a568ca7e76093ddb117c66 160000 (submodule)
--- a/rpp-lib
+++ b/rpp-lib
@@ -1 +1 @@
-Subproject commit ab932b46eaec6a8a4253c36454d75ee4fd0a00ff
+Subproject commit bcc51b05171e724172a568ca7e76093ddb117c66

diff --git a/rpp-test-sw/Makefile.inc b/rpp-test-sw/Makefile.inc
index 3b57a8e612cdcfcb63b4a4af73bdfd3d2e848c1a..8437080942f621bc924dbd4f93ed3b116eac1b6f 100644 (file)
--- a/rpp-test-sw/Makefile.inc
+++ b/rpp-test-sw/Makefile.inc
@@ -12,43 +12,7 @@ endif
 
 include $(makefile_inc_dir)/../rpp-lib/build/Makefile.rules
 include $(makefile_inc_dir)/../rpp-lib/common.mk
-
-SOURCES = \
-       cmdproc/src/cmdproc.c \
-       cmdproc/src/cmdproc_freertos.c \
-       cmdproc/src/cmdproc_io.c \
-       cmdproc/src/cmdproc_io_line.c \
-       cmdproc/src/cmdproc_io_std_line.c \
-       cmdproc/src/cmdproc_io_tisci.c \
-       cmdproc/src/cmdproc_run.c \
-       cmdproc/src/cmdproc_utils.c \
-       cmdproc/src/i2str.c \
-       commands/cmd.c \
-       commands/cmd_adc.c \
-       commands/cmd_can.c \
-       commands/cmd_pin.c \
-       commands/cmd_port.c \
-       commands/main.c
-
-SOURCES_tms570_rpp = \
-       commands/cmd_dac.c \
-       commands/cmd_din.c \
-       commands/cmd_emac.c \
-       commands/cmd_fray.c \
-       commands/cmd_fr_basic_test.c \
-       commands/cmd_hbr.c \
-       commands/cmd_hout.c \
-       commands/cmd_lin.c \
-       commands/cmd_lout.c \
-       commands/cmd_motor_example.c \
-       commands/cmd_nc.c \
-       commands/cmd_netstats.c \
-       commands/cmd_sdram.c \
-       commands/cmd_spi.c \
-       commands/cmd_vbat.c
-
-
-SOURCES += $(SOURCES_$(TARGET))
+include $(makefile_inc_dir)/Makefile.var
 
 OBJS = $(SOURCES:%.c=%.obj)
 

diff --git a/rpp-test-sw/Makefile.var b/rpp-test-sw/Makefile.var
new file mode 100644 (file)
index 0000000..8ce88a5
--- /dev/null
+++ b/rpp-test-sw/Makefile.var
@@ -0,0 +1,36 @@
+SOURCES = \
+       cmdproc/src/cmdproc.c \
+       cmdproc/src/cmdproc_freertos.c \
+       cmdproc/src/cmdproc_io.c \
+       cmdproc/src/cmdproc_io_line.c \
+       cmdproc/src/cmdproc_io_std_line.c \
+       cmdproc/src/cmdproc_io_tisci.c \
+       cmdproc/src/cmdproc_run.c \
+       cmdproc/src/cmdproc_utils.c \
+       cmdproc/src/i2str.c \
+       commands/cmd.c \
+       commands/cmd_adc.c \
+       commands/cmd_can.c \
+       commands/cmd_pin.c \
+       commands/cmd_port.c \
+       commands/main.c
+
+SOURCES_tms570_rpp = \
+       commands/cmd_dac.c \
+       commands/cmd_din.c \
+       commands/cmd_emac.c \
+       commands/cmd_fray.c \
+       commands/cmd_fr_basic_test.c \
+       commands/cmd_hbr.c \
+       commands/cmd_hout.c \
+       commands/cmd_lin.c \
+       commands/cmd_lout.c \
+       commands/cmd_motor_example.c \
+       commands/cmd_nc.c \
+       commands/cmd_netstats.c \
+       commands/cmd_sdram.c \
+       commands/cmd_spi.c \
+       commands/cmd_vbat.c
+
+
+SOURCES += $(SOURCES_$(TARGET))

diff --git a/rpp-test-sw/commands/cmd.c b/rpp-test-sw/commands/cmd.c
index a53e6a2a4462e843b5ba323e71ca18568c763531..5a01bb6f62b4849c2af7c715951debe816f67e1e 100644 (file)
--- a/rpp-test-sw/commands/cmd.c
+++ b/rpp-test-sw/commands/cmd.c
@@ -66,6 +66,7 @@ cmd_des_t const **cmd_list;
 #ifdef TARGET_TMS570_RPP
 int cmd_do_sleep(cmd_io_t *cmd_io, const struct cmd_des *des, char *param[])
 {
+#ifndef DOCGEN
        hal_gpio_pin_set_value(PIN_DSC_CANNSTB, 1);
        hal_gpio_pin_set_value(PIN_DSC_CANEN, 1);
        hal_gpio_pin_set_value(PIN_DSC_LIN2NSLP, 1);
@@ -74,6 +75,7 @@ int cmd_do_sleep(cmd_io_t *cmd_io, const struct cmd_des *des, char *param[])
        hal_gpio_pin_set_value(PIN_DSC_LIN2NSLP, 0);
        hal_gpio_pin_set_value(PIN_DSC_LIN1NSLP, 0);
        hal_gpio_pin_set_value(PIN_DSC_CANNSTB, 0);
+#endif
        return 0;
 }
 

diff --git a/rpp-test-sw/commands/doc/Makefile b/rpp-test-sw/commands/doc/Makefile
index 6f1d32c17e7e003289436d23ff17077ea5734c4d..bdd65b519d6060797f2732221c2f36f49e1f6e7a 100644 (file)
--- a/rpp-test-sw/commands/doc/Makefile
+++ b/rpp-test-sw/commands/doc/Makefile
@@ -1,10 +1,12 @@
 include ../../../rpp-lib/Makefile.config
+include ../../../rpp-lib/common.mk # for UPPERCASE
+include ../../Makefile.var
 
-COMMANDS=$(wildcard ../cmd*.c)
-COMMANDS+=$(wildcard ../_$(TARGET)/cmd*.c)
-OBJS=$(COMMANDS:../%.c=%.o) docgen.o
+COMMANDS=$(notdir $(filter commands/cmd%,$(SOURCES)))
+OBJS=$(COMMANDS:%.c=%.o) docgen.o
 
-CFLAGS=-Wall -std=c99 -I../.. -I../../cmdproc/include -I../../rpp-lib/rpp/include -DDOCGEN -DNULL=0 -D'CMD_HANDLER(x)=0'
+CFLAGS = -Wall -std=c99 -I../.. -I../../cmdproc/include -I../../rpp-lib/rpp/include -DDOCGEN -DNULL=0 -D'CMD_HANDLER(x)=0'
+CFLAGS += -DTARGET_$(call UPPERCASE,$(TARGET))
 
 
 all:print-doc
@@ -17,13 +19,8 @@ docgen: $(OBJS)
 %.o: ../%.c
        $(CC) $(CFLAGS) -c -o $@ $<
 
-_$(TARGET)/%.o: ../_$(TARGET)/%.c
-       mkdir -p _$(TARGET)
-       $(CC) $(CFLAGS) -c -o $@ $<
-
-clean:
+clean::
        rm -f $(OBJS) docgen
-       rm -rf _$(TARGET)
 
 markdown = $(shell if pandoc -h|grep -q markdown_strict; then echo markdown_strict; else echo markdown; fi)