From 1977dae043460f85d43d33a62f60e570bbafdd7f Mon Sep 17 00:00:00 2001 From: Marcel Telka Date: Thu, 13 Mar 2003 23:46:41 +0000 Subject: [PATCH] 2003-03-13 Marcel Telka * configure.ac (AC_CONFIG_HEADERS): Replaced this `new' macro ... (AM_CONFIG_HEADER): ... with this `old' one to make build compatible with automake-1.6. (AM_GNU_GETTEXT_VERSION): Relaxed version number from 0.11.5 to 0.11.4. * src/Makefile.am (jtag_LDADD): Added LIBINTL. (LIBS): Removed LIBINTL. (DEFS): Removed whole content ... (INCLUDE): ... and added it here. git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@393 b68d4a1b-bc3d-0410-92ed-d4ac073336b7 --- jtag/ChangeLog | 10 ++++++++++ jtag/configure.ac | 6 +++--- jtag/src/Makefile.am | 6 ++---- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/jtag/ChangeLog b/jtag/ChangeLog index 9df8067f..d8fd9344 100644 --- a/jtag/ChangeLog +++ b/jtag/ChangeLog @@ -1,3 +1,13 @@ +2003-03-13 Marcel Telka + + * configure.ac (AC_CONFIG_HEADERS): Replaced this `new' macro ... + (AM_CONFIG_HEADER): ... with this `old' one to make build compatible with automake-1.6. + (AM_GNU_GETTEXT_VERSION): Relaxed version number from 0.11.5 to 0.11.4. + * src/Makefile.am (jtag_LDADD): Added LIBINTL. + (LIBS): Removed LIBINTL. + (DEFS): Removed whole content ... + (INCLUDE): ... and added it here. + 2003-03-13 Marcel Telka * include/chain.h: New file. diff --git a/jtag/configure.ac b/jtag/configure.ac index d1651e47..1af3f15e 100644 --- a/jtag/configure.ac +++ b/jtag/configure.ac @@ -23,8 +23,6 @@ AC_INIT(jtag,0.3) -AC_CONFIG_HEADERS(config.h) - AC_PREREQ(2.54) AC_COPYRIGHT([Copyright (C) 2002, 2003 ETC s.r.o.]) AC_REVISION($Revision$) @@ -47,10 +45,12 @@ AC_CONFIG_FILES( AM_MAINTAINER_MODE +AM_CONFIG_HEADER(config.h) + AC_GNU_SOURCE AM_GNU_GETTEXT(external) -AM_GNU_GETTEXT_VERSION(0.11.5) +AM_GNU_GETTEXT_VERSION(0.11.4) AC_PROG_CC AC_PROG_RANLIB diff --git a/jtag/src/Makefile.am b/jtag/src/Makefile.am index 36106d2b..480e2cb4 100644 --- a/jtag/src/Makefile.am +++ b/jtag/src/Makefile.am @@ -44,9 +44,7 @@ jtag_SOURCES = \ jtag_DEPENDENCIES = lib/libjtaglib.a tap/libtap.a part/libpart.a bus/libbus.a -jtag_LDADD = -Ltap -ltap -Lpart -lpart -Llib -ljtaglib -Lbus -lbus +jtag_LDADD = -Ltap -ltap -Lpart -lpart -Llib -ljtaglib -Lbus -lbus @LIBINTL@ localedir = $(datadir)/locale -DEFS += -DLOCALEDIR=\"$(localedir)\" -DJTAG_DATA_DIR=\"$(pkgdatadir)\" -LIBS += @LIBINTL@ -INCLUDES = -I$(top_srcdir)/include $(OPENWINCE_INC) +INCLUDES = -I$(top_srcdir)/include $(OPENWINCE_INC) -DLOCALEDIR=\"$(localedir)\" -DJTAG_DATA_DIR=\"$(pkgdatadir)\"