Browse Source

build: fix automake 1.11.2 issues

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
tags/v0.6.0-rc1
Spencer Oliver 12 years ago
parent
commit
737a52d7b2
3 changed files with 5 additions and 6 deletions
  1. +3
    -2
      src/jtag/drivers/Makefile.am
  2. +0
    -2
      src/jtag/stlink/Makefile.am
  3. +2
    -2
      src/target/Makefile.am

+ 3
- 2
src/jtag/drivers/Makefile.am View File

@@ -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


+ 0
- 2
src/jtag/stlink/Makefile.am View File

@@ -5,8 +5,6 @@ noinst_LTLIBRARIES = libocdstlink.la
libocdstlink_la_SOURCES = \
$(STLINKFILES)

nobase_dist_pkglib_DATA =

STLINKFILES =

if STLINK


+ 2
- 2
src/target/Makefile.am View File

@@ -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

Loading…
Cancel
Save