2003-08-19 Marcel Telka <marcel@telka.sk>

* Makefile.am (SUBDIRS): Added po.
	* configure.ac (AC_CONFIG_FILES): Added po/Makefile.in.
	(AM_CONFIG_HEADER): Added macro with config.h parameter.
	(AM_GNU_GETTEXT, AM_GNU_GETTEXT_VERSION): Added new macro.
	(CPPFLAGS): Removed .. directory from include list.
	* gettext.h: New file.
	* sysdep.h: Ditto.
	* cmd/cmd.c: Replaced config.h include with sysdep.h.
	* cmd/cmd_detectflash.c: Ditto.
	* cmd/help.c: Ditto.
	* cmd/quit.c: Ditto.
	* flash/amd.c: Ditto.
	* flash/detectflash.c: Ditto.
	* flash/intel.c: Ditto.
	* flash/cfi.c: Added sysdep.h include.


git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@520 b68d4a1b-bc3d-0410-92ed-d4ac073336b7
master
Marcel Telka 22 years ago
parent 08790ab861
commit ad83f9dcff

@ -6,3 +6,8 @@ autom4te.cache
config.log
config.status
configure
ABOUT-NLS
m4
config.h
config.h.in
stamp-h1

@ -1,3 +1,21 @@
2003-08-19 Marcel Telka <marcel@telka.sk>
* Makefile.am (SUBDIRS): Added po.
* configure.ac (AC_CONFIG_FILES): Added po/Makefile.in.
(AM_CONFIG_HEADER): Added macro with config.h parameter.
(AM_GNU_GETTEXT, AM_GNU_GETTEXT_VERSION): Added new macro.
(CPPFLAGS): Removed .. directory from include list.
* gettext.h: New file.
* sysdep.h: Ditto.
* cmd/cmd.c: Replaced config.h include with sysdep.h.
* cmd/cmd_detectflash.c: Ditto.
* cmd/help.c: Ditto.
* cmd/quit.c: Ditto.
* flash/amd.c: Ditto.
* flash/detectflash.c: Ditto.
* flash/intel.c: Ditto.
* flash/cfi.c: Added sysdep.h include.
2003-08-13 Marcel Telka <marcel@telka.sk>
* flash/intel.c (intel_flash_autodetect32, intel_flash_autodetect, intel_flash_autodetect8): Added

@ -23,6 +23,8 @@
include $(top_srcdir)/../Makefile.rules
SUBDIRS = po
noinst_LIBRARIES = libbrux.a
libbrux_a_SOURCES = \

@ -22,7 +22,7 @@
*
*/
#include <config.h>
#include "sysdep.h"
#include <stdio.h>
#include <string.h>

@ -22,7 +22,7 @@
*
*/
#include <config.h>
#include "sysdep.h"
#include <stdio.h>

@ -22,7 +22,7 @@
*
*/
#include <config.h>
#include "sysdep.h"
#include <stdio.h>
#include <string.h>

@ -22,7 +22,7 @@
*
*/
#include <config.h>
#include "sysdep.h"
#include <stdio.h>

@ -31,12 +31,18 @@ AM_INIT_AUTOMAKE
AC_CONFIG_FILES(
Makefile
po/Makefile.in
)
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
AC_GNU_SOURCE
AM_GNU_GETTEXT(external)
AM_GNU_GETTEXT_VERSION(0.11.4)
AC_PROG_CC
AC_PROG_RANLIB
@ -59,6 +65,6 @@ fi
CPPFLAGS="$CPPFLAGS -I$openwince_includes_path -I$openwince_includes_path/device -I$openwince_includes_path/arm"
CFLAGS="$CFLAGS -Wall"
CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/.. -I\$(top_srcdir)/../include"
CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/../include"
AC_OUTPUT

@ -30,7 +30,7 @@
*
*/
#include <config.h>
#include "sysdep.h"
#include <stdint.h>
#include <stdlib.h>

@ -28,6 +28,8 @@
*
*/
#include "sysdep.h"
#include <stdint.h>
#include <stdlib.h>
#include <flash/cfi.h>

@ -28,7 +28,7 @@
*
*/
#include <config.h>
#include "sysdep.h"
#include <stdint.h>
#include <string.h>

@ -33,7 +33,7 @@
*
*/
#include <config.h>
#include "sysdep.h"
#include <stdint.h>
#include <stdlib.h>

@ -0,0 +1,69 @@
/* Convenience header for conditional use of GNU <libintl.h>.
Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
by the Free Software Foundation; either version 2, 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
Library General Public License for more details.
You should have received a copy of the GNU Library 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. */
#ifndef _LIBGETTEXT_H
#define _LIBGETTEXT_H 1
/* NLS can be disabled through the configure --disable-nls option. */
#if ENABLE_NLS
/* Get declarations of GNU message catalog functions. */
# include <libintl.h>
#else
/* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which
chokes if dcgettext is defined as a macro. So include it now, to make
later inclusions of <locale.h> a NOP. We don't include <libintl.h>
as well because people using "gettext.h" will not include <libintl.h>,
and also including <libintl.h> would fail on SunOS 4, whereas <locale.h>
is OK. */
#if defined(__sun)
# include <locale.h>
#endif
/* Disabled NLS.
The casts to 'const char *' serve the purpose of producing warnings
for invalid uses of the value returned from these functions.
On pre-ANSI systems without 'const', the config.h file is supposed to
contain "#define const". */
# define gettext(Msgid) ((const char *) (Msgid))
# define dgettext(Domainname, Msgid) ((const char *) (Msgid))
# define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid))
# define ngettext(Msgid1, Msgid2, N) \
((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
# define dngettext(Domainname, Msgid1, Msgid2, N) \
((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
# define textdomain(Domainname) ((const char *) (Domainname))
# define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname))
# define bind_textdomain_codeset(Domainname, Codeset) ((const char *) (Codeset))
#endif
/* A pseudo function call that serves as a marker for the automated
extraction of messages, but does not call gettext(). The run-time
translation is done at a different place in the code.
The argument, String, should be a literal string. Concatenated strings
and other string expressions won't work.
The macro's expansion is not parenthesized, so that it is suitable as
initializer for static 'char[]' or 'const char[]' variables. */
#define gettext_noop(String) String
#endif /* _LIBGETTEXT_H */

@ -0,0 +1,46 @@
/*
* $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.
*
*/
#ifndef SYSDEP_H
#define SYSDEP_H
#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)
#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
#endif /* SYSDEP_H */
Loading…
Cancel
Save