Skip to content

Commit 0ed03df

Browse files
R. Diezborneoa
authored andcommitted
amend angie build definitions to fix make dist
"make dist" was broken because GNU Make was using a built-in rule to try to build angie from angie.c . This is a limitation in Automake when you add a whole subdir with the same name to EXTRA_DIST. The Automake doc actually discourages adding whole subdirs. Change-Id: I85ea4ecbd529b060c70f83bcfda7522e1730480d Signed-off-by: R. Diez <[email protected]> Reviewed-on: https://review.openocd.org/c/openocd/+/8600 Tested-by: jenkins Reviewed-by: Antonio Borneo <[email protected]>
1 parent 8b5ea72 commit 0ed03df

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

src/jtag/drivers/Makefile.am

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@ noinst_LTLIBRARIES += %D%/libocdjtagdrivers.la
1010
%C%_libocdjtagdrivers_la_CPPFLAGS = $(AM_CPPFLAGS)
1111

1212
ULINK_FIRMWARE = %D%/OpenULINK
13-
ANGIE_FILES = %D%/angie
1413

1514
EXTRA_DIST += $(ULINK_FIRMWARE) \
16-
$(ANGIE_FILES) \
1715
%D%/usb_blaster/README.CheapClone \
1816
%D%/Makefile.rlink \
1917
%D%/rlink_call.m4 \
@@ -125,12 +123,17 @@ ulinkdir = $(pkgdatadir)/OpenULINK
125123
dist_ulink_DATA = $(ULINK_FIRMWARE)/ulink_firmware.hex
126124
%C%_libocdjtagdrivers_la_LIBADD += -lm
127125
endif
126+
128127
if ANGIE
129-
DRIVERFILES += %D%/angie.c
130-
angiedir = $(pkgdatadir)/angie
131-
dist_angie_DATA = $(ANGIE_FILES)/angie_firmware.bin $(ANGIE_FILES)/angie_bitstream.bit
132-
%C%_libocdjtagdrivers_la_LIBADD += -lm
128+
angiedir = $(pkgdatadir)/angie # This is only for dist_angie_DATA.
129+
DRIVERFILES += %D%/angie.c
130+
DRIVERFILES += %D%/angie/include/msgtypes.h
131+
EXTRA_DIST += %D%/angie/README
132+
dist_angie_DATA = %D%/angie/angie_firmware.bin
133+
dist_angie_DATA += %D%/angie/angie_bitstream.bit
134+
%C%_libocdjtagdrivers_la_LIBADD += -lm
133135
endif
136+
134137
if VSLLINK
135138
DRIVERFILES += %D%/versaloon/usbtoxxx/usbtogpio.c
136139
DRIVERFILES += %D%/versaloon/usbtoxxx/usbtojtagraw.c

0 commit comments

Comments
 (0)