2003-05-22 Marcel Telka <marcel@telka.sk>

* config.h: New file. Changed all relevant source files to include this file unconditionaly. * Makefile.am (noinst_HEADERS): Added config.h. * configure.ac (AM_CONFIG_HEADER): Renamed generated configuration file from config.h to acconfig.h. git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@440 b68d4a1b-bc3d-0410-92ed-d4ac073336b7
22 years ago · bb8b9d4cd9
parent 39e71ae23b
commit bb8b9d4cd9
41 changed files with 59 additions and 234 deletions
--- a/jtag/.cvsignore
+++ b/jtag/.cvsignore
@ -10,6 +10,6 @@ COPYING
 INSTALL
 ABOUT-NLS
 m4
-config.h
-config.h.in
+acconfig.h
+acconfig.h.in
 stamp-h1
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@ -1,3 +1,11 @@
+2003-05-22  Marcel Telka  <marcel@telka.sk>
+
+	* config.h: New file.
+	Changed all relevant source files to include this file unconditionaly.
+	* Makefile.am (noinst_HEADERS): Added config.h.
+	* configure.ac (AM_CONFIG_HEADER): Renamed generated configuration file
+		from config.h to acconfig.h.
+
 2003-05-22  Marcel Telka  <marcel@telka.sk>

 	* src/jtag.c: Added new global variable 'big_endian'.
--- a/jtag/Makefile.am
+++ b/jtag/Makefile.am
@ -30,6 +30,9 @@ SUBDIRS = \
 	src \
 	po

+noinst_HEADERS = \
+	config.h
+
 EXTRA_DIST = \
 	Makefile.rules

--- a/jtag/config.h
+++ b/jtag/config.h
@ -0,0 +1,41 @@
+/*
+ * $Id$
+ *
+ * Copyright (C) 2003 ETC s.r.o.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ * Written by Marcel Telka <marcel@telka.sk>, 2003.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <acconfig.h>
+#endif
+
+#include "gettext.h"
+#define	_(s)		gettext(s)
+#define	N_(s)		gettext_noop(s)
+#define	P_(s,p,n)	ngettext(s,p,n)
+
+#ifdef S_SPLINT_S
+#undef gettext
+#define	gettext(s)	s
+#undef gettext_noop
+#define	gettext_noop(s)	s
+#undef ngettext
+#define	ngettext(s,p,n)	s
+#endif
--- a/jtag/configure.ac
+++ b/jtag/configure.ac
@ -48,7 +48,7 @@ AC_CONFIG_FILES(

 AM_MAINTAINER_MODE

-AM_CONFIG_HEADER(config.h)
+AM_CONFIG_HEADER(acconfig.h)

 AC_GNU_SOURCE

--- a/jtag/src/bus/ixp425.c
+++ b/jtag/src/bus/ixp425.c
@ -23,14 +23,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#include "gettext.h"
-#define	_(s)		gettext(s)
-#define	N_(s)		gettext_noop(s)
-#define	P_(s,p,n)	ngettext(s,p,n)

 #include <stdlib.h>
 #include <stdint.h>
--- a/jtag/src/bus/pxa2x0.c
+++ b/jtag/src/bus/pxa2x0.c
@ -26,14 +26,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#include "gettext.h"
-#define	_(s)		gettext(s)
-#define	N_(s)		gettext_noop(s)
-#define	P_(s,p,n)	ngettext(s,p,n)

 #include <stdlib.h>
 #include <stdint.h>
--- a/jtag/src/bus/sa1110.c
+++ b/jtag/src/bus/sa1110.c
@ -26,14 +26,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#include "gettext.h"
-#define	_(s)		gettext(s)
-#define	N_(s)		gettext_noop(s)
-#define	P_(s,p,n)	ngettext(s,p,n)

 #include <stdlib.h>
 #include <stdint.h>
--- a/jtag/src/cmd/cable.c
+++ b/jtag/src/cmd/cable.c
@ -22,14 +22,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#include "gettext.h"
-#define	_(s)		gettext(s)
-#define	N_(s)		gettext_noop(s)
-#define	P_(s,p,n)	ngettext(s,p,n)

 #include <stdio.h>
 #include <string.h>
--- a/jtag/src/cmd/cmd.c
+++ b/jtag/src/cmd/cmd.c
@ -22,14 +22,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#include "gettext.h"
-#define	_(s)		gettext(s)
-#define	N_(s)		gettext_noop(s)
-#define	P_(s,p,n)	ngettext(s,p,n)

 #include <stdio.h>
 #include <string.h>
--- a/jtag/src/cmd/detect.c
+++ b/jtag/src/cmd/detect.c
@ -22,14 +22,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#include "gettext.h"
-#define	_(s)		gettext(s)
-#define	N_(s)		gettext_noop(s)
-#define	P_(s,p,n)	ngettext(s,p,n)

 #include <stdio.h>
 #include <string.h>
--- a/jtag/src/cmd/detectflash.c
+++ b/jtag/src/cmd/detectflash.c
@ -22,14 +22,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#include "gettext.h"
-#define	_(s)		gettext(s)
-#define	N_(s)		gettext_noop(s)
-#define	P_(s,p,n)	ngettext(s,p,n)

 #include <stdio.h>

--- a/jtag/src/cmd/discovery.c
+++ b/jtag/src/cmd/discovery.c
@ -22,14 +22,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#include "gettext.h"
-#define	_(s)		gettext(s)
-#define	N_(s)		gettext_noop(s)
-#define	P_(s,p,n)	ngettext(s,p,n)

 #include <stdio.h>

--- a/jtag/src/cmd/dr.c
+++ b/jtag/src/cmd/dr.c
@ -22,14 +22,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#include "gettext.h"
-#define	_(s)		gettext(s)
-#define	N_(s)		gettext_noop(s)
-#define	P_(s,p,n)	ngettext(s,p,n)

 #include <stdio.h>
 #include <string.h>
--- a/jtag/src/cmd/endian.c
+++ b/jtag/src/cmd/endian.c
@ -22,14 +22,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#include "gettext.h"
-#define	_(s)		gettext(s)
-#define	N_(s)		gettext_noop(s)
-#define	P_(s,p,n)	ngettext(s,p,n)

 #include <stdio.h>
 #include <string.h>
--- a/jtag/src/cmd/flashmem.c
+++ b/jtag/src/cmd/flashmem.c
@ -22,14 +22,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#include "gettext.h"
-#define	_(s)		gettext(s)
-#define	N_(s)		gettext_noop(s)
-#define	P_(s,p,n)	ngettext(s,p,n)

 #include <stdio.h>
 #include <stdint.h>
--- a/jtag/src/cmd/frequency.c
+++ b/jtag/src/cmd/frequency.c
@ -22,14 +22,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#include "gettext.h"
-#define	_(s)		gettext(s)
-#define	N_(s)		gettext_noop(s)
-#define	P_(s,p,n)	ngettext(s,p,n)

 #include <stdio.h>

--- a/jtag/src/cmd/get.c
+++ b/jtag/src/cmd/get.c
@ -22,14 +22,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#include "gettext.h"
-#define	_(s)		gettext(s)
-#define	N_(s)		gettext_noop(s)
-#define	P_(s,p,n)	ngettext(s,p,n)

 #include <stdio.h>
 #include <string.h>
--- a/jtag/src/cmd/help.c
+++ b/jtag/src/cmd/help.c
@ -22,14 +22,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#include "gettext.h"
-#define	_(s)		gettext(s)
-#define	N_(s)		gettext_noop(s)
-#define	P_(s,p,n)	ngettext(s,p,n)

 #include <stdio.h>
 #include <string.h>
--- a/jtag/src/cmd/instruction.c
+++ b/jtag/src/cmd/instruction.c
@ -22,14 +22,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#include "gettext.h"
-#define	_(s)		gettext(s)
-#define	N_(s)		gettext_noop(s)
-#define	P_(s,p,n)	ngettext(s,p,n)

 #include <stdio.h>

--- a/jtag/src/cmd/print.c
+++ b/jtag/src/cmd/print.c
@ -22,14 +22,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#include "gettext.h"
-#define	_(s)		gettext(s)
-#define	N_(s)		gettext_noop(s)
-#define	P_(s,p,n)	ngettext(s,p,n)

 #include <stdio.h>

--- a/jtag/src/cmd/quit.c
+++ b/jtag/src/cmd/quit.c
@ -22,14 +22,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#include "gettext.h"
-#define	_(s)		gettext(s)
-#define	N_(s)		gettext_noop(s)
-#define	P_(s,p,n)	ngettext(s,p,n)

 #include <stdio.h>

--- a/jtag/src/cmd/readmem.c
+++ b/jtag/src/cmd/readmem.c
@ -22,14 +22,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#include "gettext.h"
-#define	_(s)		gettext(s)
-#define	N_(s)		gettext_noop(s)
-#define	P_(s,p,n)	ngettext(s,p,n)

 #include <stdio.h>
 #include <stdint.h>
--- a/jtag/src/cmd/script.c
+++ b/jtag/src/cmd/script.c
@ -22,14 +22,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#include "gettext.h"
-#define	_(s)		gettext(s)
-#define	N_(s)		gettext_noop(s)
-#define	P_(s,p,n)	ngettext(s,p,n)

 #include <stdio.h>

--- a/jtag/src/cmd/set.c
+++ b/jtag/src/cmd/set.c
@ -22,14 +22,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#include "gettext.h"
-#define	_(s)		gettext(s)
-#define	N_(s)		gettext_noop(s)
-#define	P_(s,p,n)	ngettext(s,p,n)

 #include <stdio.h>
 #include <string.h>
--- a/jtag/src/cmd/shift.c
+++ b/jtag/src/cmd/shift.c
@ -22,14 +22,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#include "gettext.h"
-#define	_(s)		gettext(s)
-#define	N_(s)		gettext_noop(s)
-#define	P_(s,p,n)	ngettext(s,p,n)

 #include <stdio.h>
 #include <string.h>
--- a/jtag/src/discovery.c
+++ b/jtag/src/discovery.c
@ -22,9 +22,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif

 #include <stdio.h>
 #include <stdlib.h>
--- a/jtag/src/jtag.c
+++ b/jtag/src/jtag.c
@ -22,14 +22,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#include "gettext.h"
-#define	_(s)		gettext(s)
-#define	N_(s)		gettext_noop(s)
-#define	P_(s,p,n)	ngettext(s,p,n)

 #include <stdio.h>
 #include <stdlib.h>
--- a/jtag/src/lib/getdelim.c
+++ b/jtag/src/lib/getdelim.c
@ -22,14 +22,12 @@
 *
 */

+#include <config.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifndef HAVE_GETDELIM

 #define	GETDELIM_BUFFER	128
--- a/jtag/src/lib/getline.c
+++ b/jtag/src/lib/getline.c
@ -22,13 +22,11 @@
 *
 */

+#include <config.h>
+
 #include <stdio.h>
 #include <unistd.h>

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifndef HAVE_GETLINE

 #ifndef HAVE_GETDELIM
--- a/jtag/src/part/data_register.c
+++ b/jtag/src/part/data_register.c
@ -22,14 +22,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#include "gettext.h"
-#define	_(s)		gettext(s)
-#define	N_(s)		gettext_noop(s)
-#define	P_(s,p,n)	ngettext(s,p,n)

 #include <stdlib.h>
 #include <string.h>
--- a/jtag/src/part/instruction.c
+++ b/jtag/src/part/instruction.c
@ -22,14 +22,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#include "gettext.h"
-#define	_(s)		gettext(s)
-#define	N_(s)		gettext_noop(s)
-#define	P_(s,p,n)	ngettext(s,p,n)

 #include <stdlib.h>
 #include <stdio.h>
--- a/jtag/src/part/parse.c
+++ b/jtag/src/part/parse.c
@ -22,14 +22,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#include "gettext.h"
-#define	_(s)		gettext(s)
-#define	N_(s)		gettext_noop(s)
-#define	P_(s,p,n)	ngettext(s,p,n)

 #include <stdlib.h>
 #include <string.h>
--- a/jtag/src/part/part.c
+++ b/jtag/src/part/part.c
@ -22,14 +22,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#include "gettext.h"
-#define	_(s)		gettext(s)
-#define	N_(s)		gettext_noop(s)
-#define	P_(s,p,n)	ngettext(s,p,n)

 #include <stdlib.h>
 #include <string.h>
--- a/jtag/src/readmem.c
+++ b/jtag/src/readmem.c
@ -28,14 +28,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#include "gettext.h"
-#define	_(s)		gettext(s)
-#define	N_(s)		gettext_noop(s)
-#define	P_(s,p,n)	ngettext(s,p,n)

 #include <stdint.h>
 #include <string.h>
--- a/jtag/src/tap/cable.c
+++ b/jtag/src/tap/cable.c
@ -22,9 +22,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif

 #include <stdlib.h>
 #include <unistd.h>
--- a/jtag/src/tap/chain.c
+++ b/jtag/src/tap/chain.c
@ -22,14 +22,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#include "gettext.h"
-#define	_(s)		gettext(s)
-#define	N_(s)		gettext_noop(s)
-#define	P_(s,p,n)	ngettext(s,p,n)

 #include <stdlib.h>

--- a/jtag/src/tap/parport.c
+++ b/jtag/src/tap/parport.c
@ -22,9 +22,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif

 #include "parport.h"

--- a/jtag/src/tap/parport/direct.c
+++ b/jtag/src/tap/parport/direct.c
@ -24,14 +24,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#include "gettext.h"
-#define	_(s)		gettext(s)
-#define	N_(s)		gettext_noop(s)
-#define	P_(s,p,n)	ngettext(s,p,n)

 #include <stdlib.h>
 #include <string.h>
--- a/jtag/src/tap/parport/ppdev.c
+++ b/jtag/src/tap/parport/ppdev.c
@ -23,17 +23,10 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif

 #ifdef HAVE_LINUX_PPDEV_H

-#include "gettext.h"
-#define	_(s)		gettext(s)
-#define	N_(s)		gettext_noop(s)
-#define	P_(s,p,n)	ngettext(s,p,n)
-
 #include <fcntl.h>
 #include <stropts.h>
 #include <unistd.h>
--- a/jtag/src/tap/tap.c
+++ b/jtag/src/tap/tap.c
@ -22,14 +22,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#include "gettext.h"
-#define	_(s)		gettext(s)
-#define	N_(s)		gettext_noop(s)
-#define	P_(s,p,n)	ngettext(s,p,n)

 #include <stdio.h>