This is an automated email from Gerrit.
"R. Diez <rdiez-2...@rd10.de>" just uploaded a new patch set to Gerrit, which
you can find at https://review.openocd.org/c/openocd/+/8600
-- gerrit
commit f16b07221dfccd984321f343106a5f2d5fc0c403
Author: R. Diez <rdiezmail-open...@yahoo.de>
Date: Thu Nov 28 21:47:34 2024 +0100
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 <rdiezmail-open...@yahoo.de>
diff --git a/src/jtag/drivers/Makefile.am b/src/jtag/drivers/Makefile.am
index 8be834859c..da0663fd4d 100644
--- a/src/jtag/drivers/Makefile.am
+++ b/src/jtag/drivers/Makefile.am
@@ -10,10 +10,8 @@ noinst_LTLIBRARIES += %D%/libocdjtagdrivers.la
%C%_libocdjtagdrivers_la_CPPFLAGS = $(AM_CPPFLAGS)
ULINK_FIRMWARE = %D%/OpenULINK
-ANGIE_FILES = %D%/angie
EXTRA_DIST += $(ULINK_FIRMWARE) \
- $(ANGIE_FILES) \
%D%/usb_blaster/README.CheapClone \
%D%/Makefile.rlink \
%D%/rlink_call.m4 \
@@ -125,12 +123,17 @@ ulinkdir = $(pkgdatadir)/OpenULINK
dist_ulink_DATA = $(ULINK_FIRMWARE)/ulink_firmware.hex
%C%_libocdjtagdrivers_la_LIBADD += -lm
endif
+
if ANGIE
-DRIVERFILES += %D%/angie.c
-angiedir = $(pkgdatadir)/angie
-dist_angie_DATA = $(ANGIE_FILES)/angie_firmware.bin
$(ANGIE_FILES)/angie_bitstream.bit
-%C%_libocdjtagdrivers_la_LIBADD += -lm
+ angiedir = $(pkgdatadir)/angie # This is only for dist_angie_DATA.
+ DRIVERFILES += %D%/angie.c
+ DRIVERFILES += %D%/angie/include/msgtypes.h
+ EXTRA_DIST += %D%/angie/README
+ dist_angie_DATA = %D%/angie/angie_firmware.bin
+ dist_angie_DATA += %D%/angie/angie_bitstream.bit
+ %C%_libocdjtagdrivers_la_LIBADD += -lm
endif
+
if VSLLINK
DRIVERFILES += %D%/versaloon/usbtoxxx/usbtogpio.c
DRIVERFILES += %D%/versaloon/usbtoxxx/usbtojtagraw.c
--
