From 388bdf7a9d47a7b60bd2f410338ff9d5fff069b3 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Fri, 17 Jun 2011 20:04:54 +0000
Subject: [PATCH] drop bsdl_config.h and use config.h directly to simplify the
 local build logic a bit

git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@1910 b68d4a1b-bc3d-0410-92ed-d4ac073336b7
---
 urjtag/.gitignore             |  1 -
 urjtag/ChangeLog              |  4 ++++
 urjtag/src/bsdl/Makefile.am   | 17 ++++-------------
 urjtag/src/bsdl/bsdl_sysdep.h |  4 +++-
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/urjtag/.gitignore b/urjtag/.gitignore
index c97307b6..140b4650 100644
--- a/urjtag/.gitignore
+++ b/urjtag/.gitignore
@@ -70,7 +70,6 @@ Makefile.in
 /src/apps/jtag/jtag
 /src/bsdl/bsdl_bison.c
 /src/bsdl/bsdl_bison.h
-/src/bsdl/bsdl_config.h
 /src/bsdl/bsdl_flex.c
 /src/bsdl/vhdl_bison.c
 /src/bsdl/vhdl_bison.h
diff --git a/urjtag/ChangeLog b/urjtag/ChangeLog
index 9474f974..fbae6c24 100644
--- a/urjtag/ChangeLog
+++ b/urjtag/ChangeLog
@@ -4,6 +4,10 @@
   * data/xilinx/xc18v02pc44/xc18v02pc44, data/xilinx/xc18v02pc44/STEPPINGS:
     Add data files for new xilinx parts.
 
+  * src/bsdl/bsdl_sysdep.h: Use config.h directly.
+  * src/bsdl/Makefile.am: Drop bsdl_config.h generation and dependencies.
+  * .gitignore: Drop bsdl_config.h from ignore list.
+
 2011-06-11  Mike Frysinger  <vapier@gentoo.org>
 
   * src/bus/bf518f_ezbrd.c, src/bus/bf537_stamp.c, src/bus/bf561_ezkit.c,
diff --git a/urjtag/src/bsdl/Makefile.am b/urjtag/src/bsdl/Makefile.am
index ba5d7fd3..a9ec61d2 100644
--- a/urjtag/src/bsdl/Makefile.am
+++ b/urjtag/src/bsdl/Makefile.am
@@ -37,7 +37,6 @@ libbsdl_flex_la_SOURCES = \
 
 noinst_HEADERS = \
 	bsdl_bison.h \
-	bsdl_config.h \
 	bsdl_msg.h \
 	bsdl_parser.h \
 	bsdl_sysdep.h \
@@ -52,22 +51,15 @@ libbsdl_flex_la_CFLAGS = \
 	-Wno-error
 
 # additional dependencies
-# - all files depend on bsdl_config.h which dynamically generated
 # - *_flex files must be processed after their *_bison counterparts
 #   to ensure that *_bison.h is present
-libbsdl_flex_la-vhdl_flex.$(OBJEXT): vhdl_bison.h bsdl_config.h
-vhdl_bison.$(OBJEXT): bsdl_config.h
-libbsdl_flex_la-bsdl_flex.$(OBJEXT): bsdl_bison.h bsdl_config.h
-bsdl_bison.$(OBJEXT): bsdl_config.h
-bsdl.$(OBJEXT) : bsdl_config.h
-bsdl_sem.$(OBJEXT): bsdl_bison.h bsdl_config.h
+libbsdl_flex_la-vhdl_flex.$(OBJEXT): vhdl_bison.h
+libbsdl_flex_la-bsdl_flex.$(OBJEXT): bsdl_bison.h
+bsdl_sem.$(OBJEXT): bsdl_bison.h
 
 vhdl_bison.h: vhdl_bison.c
 bsdl_bison.h: bsdl_bison.c
 
-bsdl_config.h: ../../config.h
-	grep 'DMALLOC' $< > $@
-
 AM_LFLAGS = -i
 
 MAINTAINERCLEANFILES = \
@@ -75,5 +67,4 @@ MAINTAINERCLEANFILES = \
 	vhdl_bison.h \
 	bsdl_bison.c \
 	bsdl_bison.h \
-	vhdl_flex.c \
-	bsdl_config.h
+	vhdl_flex.c
diff --git a/urjtag/src/bsdl/bsdl_sysdep.h b/urjtag/src/bsdl/bsdl_sysdep.h
index 9a5e7f7d..c5f41e80 100644
--- a/urjtag/src/bsdl/bsdl_sysdep.h
+++ b/urjtag/src/bsdl/bsdl_sysdep.h
@@ -26,7 +26,9 @@
 #define BSDL_SYSDEP_H
 
 
-#include "bsdl_config.h"
+#include "config.h"
+/* Some of the config.h defines conflict with yacc output */
+#undef PACKAGE
 
 #include <urjtag/gettext.h>
 #define _(s)            gettext(s)