I'm committing this patch, which fixes the issues that I found when
building UrJTAG out of the source tree:
* po/POTFILES.in should contains .y and .l files instead of the
generated C files.
* bsdl2jtag_LDADD and jtag_LDADD should include libraries in build
directories.
* src/bus/ixp465.c does not include the header files in the right way.
Jie
* po/POTFILES.in: Remove src/bsdl/bsdl_bison.c, src/bsdl/bsdl_flex.c,
src/bsdl/vhdl_bison.c and src/bsdl/vhdl_flex.c.
Add src/bsdl/bsdl_bison.y, src/bsdl/bsdl_flex.l, src/bsdl/vhdl_bison.y
and src/bsdl/vhdl_flex.l.
* po/fr.po: Regenerate.
* po/rw.po: Regenerate.
* po/sk.po: Regenerate.
* src/apps/bsdl2jtag/Makefile.am (bsdl2jtag_LDADD): Replace top_srcdir
with top_builddir.
* src/apps/jtag/Makefile.am (jtag_LDADD): Likewise.
* src/bus/ixp465.c: Include <urjtag/part.h>, <urjtag/bus.h>,
<urjtag/chain.h>, <urjtag/bssignal.h> and <urjtag/jtag.h>
instead of "part.h", "bus.h", "chain.h", "bssignal.h" and "jtag.h".
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 82cada0..db2f34c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,12 +1,12 @@
# $Id$
src/apps/bsdl2jtag/bsdl2jtag.c
src/apps/jtag/jtag.c
-src/bsdl/bsdl_bison.c
+src/bsdl/bsdl_bison.y
src/bsdl/bsdl.c
-src/bsdl/bsdl_flex.c
+src/bsdl/bsdl_flex.l
src/bsdl/bsdl_sem.c
-src/bsdl/vhdl_bison.c
-src/bsdl/vhdl_flex.c
+src/bsdl/vhdl_bison.y
+src/bsdl/vhdl_flex.l
src/bus/arm9tdmi.c
src/bus/au1500.c
src/bus/avr32.c
@@ -101,9 +101,9 @@ src/part/data_register.c
src/part/instruction.c
src/part/part.c
src/part/signal.c
-src/svf/svf_bison.c
+src/svf/svf_bison.y
src/svf/svf.c
-src/svf/svf_flex.c
+src/svf/svf_flex.l
src/tap/cable/arcom.c
src/tap/cable/byteblaster.c
src/tap/cable.c
diff --git a/src/apps/bsdl2jtag/Makefile.am b/src/apps/bsdl2jtag/Makefile.am
index c2c2b30..33421cb 100644
--- a/src/apps/bsdl2jtag/Makefile.am
+++ b/src/apps/bsdl2jtag/Makefile.am
@@ -28,7 +28,7 @@ bsdl2jtag_SOURCES = \
bsdl2jtag.c
bsdl2jtag_LDADD = \
- $(top_srcdir)/src/liburjtag.la \
+ $(top_builddir)/src/liburjtag.la \
@LIBINTL@
localedir = $(datadir)/locale
diff --git a/src/apps/jtag/Makefile.am b/src/apps/jtag/Makefile.am
index cdae894..c0e8802 100644
--- a/src/apps/jtag/Makefile.am
+++ b/src/apps/jtag/Makefile.am
@@ -30,7 +30,7 @@ jtag_SOURCES = \
jtag.c
jtag_LDADD = \
- $(top_srcdir)/src/liburjtag.la \
+ $(top_builddir)/src/liburjtag.la \
@LIBINTL@
localedir = $(datadir)/locale
diff --git a/src/bus/ixp465.c b/src/bus/ixp465.c
index 393ebd4..f324c6f 100644
--- a/src/bus/ixp465.c
+++ b/src/bus/ixp465.c
@@ -29,11 +29,12 @@
#include <stdint.h>
#include <string.h>
-#include "part.h"
-#include "bus.h"
-#include "chain.h"
-#include "bssignal.h"
-#include "jtag.h"
+#include <urjtag/part.h>
+#include <urjtag/bus.h>
+#include <urjtag/chain.h>
+#include <urjtag/bssignal.h>
+#include <urjtag/jtag.h>
+
#include "buses.h"
#include "generic_bus.h"
------------------------------------------------------------------------------
Throughout its 18-year history, RSA Conference consistently attracts the
world's best and brightest in the field, creating opportunities for Conference
attendees to learn about information security's most important issues through
interactions with peers, luminaries and emerging and established companies.
http://p.sf.net/sfu/rsaconf-dev2dev
_______________________________________________
UrJTAG-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/urjtag-development
