Code Review / openocd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 2e832a3)
- fix issue when building in separate build dir
authorntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Sat, 12 Jul 2008 22:40:49 +0000 (22:40 +0000)
committerntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Sat, 12 Jul 2008 22:40:49 +0000 (22:40 +0000)
- Thanks Duane Ellis

git-svn-id: svn://svn.berlios.de/openocd/trunk@801 b42882b7-edfa-0310-969c-e2dbd0fdcd60

src/Makefile.am patch | blob | history

diff --git a/src/Makefile.am b/src/Makefile.am
index 2f1a221138a56934c05567415dc6ba672eff284e..502a63d50c28cdfeb1ad44ddec748d5d692febec 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -78,8 +78,6 @@ openocd_LDADD = $(top_builddir)/src/startup.o $(top_builddir)/src/xsvf/libxsvf.a
        $(top_builddir)/src/pld/libpld.a \
        $(FTDI2232LIB) $(FTD2XXLIB) $(MINGWLDADD) $(LIBUSB)
 
-       
-       
 nobase_dist_pkglib_DATA = \
        tcl/bitsbytes.tcl  \
        tcl/chip/atmel/at91/aic.tcl  \
@@ -99,4 +97,6 @@ nobase_dist_pkglib_DATA = \
 # Convert .tcl to object
 
 $(top_builddir)/src/startup.o: $(top_srcdir)/src/startup.tcl
-       ${OBJCOPY} -I binary -O ${OBJCOPY_FORMAT} -B ${OBJCOPY_ARCH} startup.tcl startup.o
+       abs_builddir=`cd $(top_builddir) && pwd` && \
+       cd $(top_srcdir)/src &&  \
+       ${OBJCOPY} -I binary -O ${OBJCOPY_FORMAT} -B ${OBJCOPY_ARCH} startup.tcl $$abs_builddir/src/startup.o
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)