diff options
| -rw-r--r-- | src/jtag/drivers/Makefile.am | 5 | ||||
| -rw-r--r-- | src/jtag/stlink/Makefile.am | 2 | ||||
| -rw-r--r-- | src/target/Makefile.am | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/jtag/drivers/Makefile.am b/src/jtag/drivers/Makefile.am index 7dbaab2..134323d 100644 --- 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 09e47fd..925d07e 100644 --- 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 ab7b3be..b98aacc 100644 --- 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 |