Code Review / openocd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: b0ef9cf)
build: fix automake 1.11.2 issues
authorSpencer Oliver <spen@spen-soft.co.uk>
Tue, 14 Feb 2012 12:57:18 +0000 (12:57 +0000)
committerSpencer Oliver <spen@spen-soft.co.uk>
Thu, 16 Feb 2012 08:56:42 +0000 (08:56 +0000)
automake 1.11.2 throws `pkglibdir' is not a legitimate directory for `DATA'
if nobase_dist_pkglib_DATA is used.

We work around this issue by defining our own location.

Change-Id: I3c29e2df0b67e745283c50d358e31699bd60dc74
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/457
Tested-by: jenkins
src/jtag/drivers/Makefile.am patch | blob | history
src/jtag/stlink/Makefile.am patch | blob | history
src/target/Makefile.am patch | blob | history

diff --git a/src/jtag/drivers/Makefile.am b/src/jtag/drivers/Makefile.am
index 7dbaab2f9049f2d7ec14db9a023a11abb8889dbf..134323d96fc2c7d0433f8587c64d36e66fbf617b 100644 (file)
--- a/src/jtag/drivers/Makefile.am
+++ b/src/jtag/drivers/Makefile.am
@@ -5,7 +5,8 @@ noinst_LTLIBRARIES = libocdjtagdrivers.la
 libocdjtagdrivers_la_SOURCES = \
        $(DRIVERFILES)
 
-nobase_dist_pkglib_DATA =
+ocddatadir = $(pkglibdir)
+nobase_dist_ocddata_DATA =
 
 ULINK_FIRMWARE = $(srcdir)/OpenULINK
 
@@ -74,7 +75,7 @@ DRIVERFILES += rlink.c rlink_speed_table.c
 endif
 if ULINK
 DRIVERFILES += ulink.c
-nobase_dist_pkglib_DATA += $(ULINK_FIRMWARE)/ulink_firmware.hex
+nobase_dist_ocddata_DATA += $(ULINK_FIRMWARE)/ulink_firmware.hex
 endif
 if VSLLINK
 DRIVERFILES += versaloon/usbtoxxx/usbtogpio.c
diff --git a/src/jtag/stlink/Makefile.am b/src/jtag/stlink/Makefile.am
index 09e47fd7550f79834c1a7f696535f8774a9d9185..925d07ec9ee20364f134e1c42d271cc34f55876c 100644 (file)
--- a/src/jtag/stlink/Makefile.am
+++ b/src/jtag/stlink/Makefile.am
@@ -5,8 +5,6 @@ noinst_LTLIBRARIES = libocdstlink.la
 libocdstlink_la_SOURCES = \
        $(STLINKFILES)
 
-nobase_dist_pkglib_DATA =
-
 STLINKFILES =
 
 if STLINK
diff --git a/src/target/Makefile.am b/src/target/Makefile.am
index ab7b3be2fecdecd162f927d639f22be877eb2659..b98aacc08ad9f229c6c446093fe6c930260c7c12 100644 (file)
--- a/src/target/Makefile.am
+++ b/src/target/Makefile.am
@@ -164,7 +164,7 @@ noinst_HEADERS = \
        avr32_mem.h \
        avr32_regs.h
 
-nobase_dist_pkglib_DATA =
-nobase_dist_pkglib_DATA += ecos/at91eb40a.elf
+ocddatadir = $(pkglibdir)
+nobase_dist_ocddata_DATA = ecos/at91eb40a.elf
 
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)