diff options
| author | Tim Newsome <tim@sifive.com> | 2020-12-31 13:40:49 -0800 |
|---|---|---|
| committer | Tim Newsome <tim@sifive.com> | 2020-12-31 13:40:49 -0800 |
| commit | 11b8110443bbd158f73c7bf00a52bd6863d6b42f (patch) | |
| tree | 23cb0e565256d2c94b0774acbf8156f19e409ef2 /Makefile.am | |
| parent | b8620764c09cbb05d8179fd5f520110fee114417 (diff) | |
| parent | c69b4deae36a7bcbab5df80ec2a5dbfd652e25ac (diff) | |
| download | riscv-openocd-11b8110443bbd158f73c7bf00a52bd6863d6b42f.zip riscv-openocd-11b8110443bbd158f73c7bf00a52bd6863d6b42f.tar.gz riscv-openocd-11b8110443bbd158f73c7bf00a52bd6863d6b42f.tar.bz2 | |
Merge branch 'master' into from_upstream
Conflicts:
.github/workflows/snapshot.yml
.gitmodules
src/flash/nor/drivers.c
src/helper/jep106.inc
src/rtos/hwthread.c
src/target/riscv/riscv.c
src/target/target.c
Change-Id: I62f65e10d15dcda4c405d4042cce1d96f8e1680a
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 36f6c4f..2d276eb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -43,13 +43,14 @@ if INTERNAL_JIMTCL AM_CPPFLAGS += -I$(top_srcdir)/jimtcl \ -I$(top_builddir)/jimtcl endif +EXTRA_DIST_NEWS != ls $(srcdir)/NEWS-* EXTRA_DIST += \ BUGS \ HACKING \ NEWTAPS \ README.Windows \ README.OSX \ - $(wildcard $(srcdir)/NEWS*) \ + $(EXTRA_DIST_NEWS) \ Doxyfile.in \ tools/logger.pl \ tools/rlink_make_speed_table \ |