From 2b799c36b9aa27c73648bd7943380ace9dae1100 Mon Sep 17 00:00:00 2001 From: Marcel Telka Date: Tue, 18 Feb 2003 12:09:25 +0000 Subject: [PATCH] 2003-02-18 Marcel Telka * configure.ac (AC_CONFIG_FILES): Added src/bus/Makefile. * src/bus.h: Moved this file... * include/bus.h: ...here. * include/Makefile.am (noinst_HEADERS): Added bus.h. * src/ixp425.c: Moved this file... * src/bus/ixp425.c: ...here. * src/pxa250.c: Moved this file... * src/bus/pxa2x0.c: ...here. * src/sa1110.c: Moved this file... * src/bus/sa1110.c: ...here. * src/bus/Makefile.am: New file. * src/Makefile.am (SUBDIRS): Added bus. (jtag_SOURCES): Removed bus.h, ixp425.c, pxa250.c, sa1110.c. (jtag_DEPENDENCIES): Added libbus.a. (jtag_LDADD): Ditto. git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@368 b68d4a1b-bc3d-0410-92ed-d4ac073336b7 --- jtag/ChangeLog | 18 +++++++++++++++++ jtag/configure.ac | 1 + jtag/include/Makefile.am | 1 + jtag/{src => include}/bus.h | 0 jtag/src/Makefile.am | 11 ++++------ jtag/src/bus/.cvsignore | 3 +++ jtag/src/bus/Makefile.am | 31 +++++++++++++++++++++++++++++ jtag/src/{ => bus}/ixp425.c | 0 jtag/src/{pxa250.c => bus/pxa2x0.c} | 0 jtag/src/{ => bus}/sa1110.c | 0 10 files changed, 58 insertions(+), 7 deletions(-) rename jtag/{src => include}/bus.h (100%) create mode 100644 jtag/src/bus/.cvsignore create mode 100644 jtag/src/bus/Makefile.am rename jtag/src/{ => bus}/ixp425.c (100%) rename jtag/src/{pxa250.c => bus/pxa2x0.c} (100%) rename jtag/src/{ => bus}/sa1110.c (100%) diff --git a/jtag/ChangeLog b/jtag/ChangeLog index d5b06f55..61f6ee7b 100644 --- a/jtag/ChangeLog +++ b/jtag/ChangeLog @@ -1,3 +1,21 @@ +2003-02-18 Marcel Telka + + * configure.ac (AC_CONFIG_FILES): Added src/bus/Makefile. + * src/bus.h: Moved this file... + * include/bus.h: ...here. + * include/Makefile.am (noinst_HEADERS): Added bus.h. + * src/ixp425.c: Moved this file... + * src/bus/ixp425.c: ...here. + * src/pxa250.c: Moved this file... + * src/bus/pxa2x0.c: ...here. + * src/sa1110.c: Moved this file... + * src/bus/sa1110.c: ...here. + * src/bus/Makefile.am: New file. + * src/Makefile.am (SUBDIRS): Added bus. + (jtag_SOURCES): Removed bus.h, ixp425.c, pxa250.c, sa1110.c. + (jtag_DEPENDENCIES): Added libbus.a. + (jtag_LDADD): Ditto. + 2003-02-18 Marcel Telka * src/tap/cable.c: Added include for useconds_t on some systems. diff --git a/jtag/configure.ac b/jtag/configure.ac index e88b8213..aec74172 100644 --- a/jtag/configure.ac +++ b/jtag/configure.ac @@ -39,6 +39,7 @@ AC_CONFIG_FILES( src/lib/Makefile src/tap/Makefile src/part/Makefile + src/bus/Makefile ) AM_MAINTAINER_MODE diff --git a/jtag/include/Makefile.am b/jtag/include/Makefile.am index 875a6dd4..76cfea6a 100644 --- a/jtag/include/Makefile.am +++ b/jtag/include/Makefile.am @@ -23,6 +23,7 @@ noinst_HEADERS = \ bsbit.h \ + bus.h \ cable.h \ data_register.h \ instruction.h \ diff --git a/jtag/src/bus.h b/jtag/include/bus.h similarity index 100% rename from jtag/src/bus.h rename to jtag/include/bus.h diff --git a/jtag/src/Makefile.am b/jtag/src/Makefile.am index b90b1d55..91ba239c 100644 --- a/jtag/src/Makefile.am +++ b/jtag/src/Makefile.am @@ -24,7 +24,8 @@ SUBDIRS = \ lib \ tap \ - part + part \ + bus bin_PROGRAMS = jtag @@ -34,18 +35,14 @@ jtag_SOURCES = \ discovery.c \ readmem.c \ detect.h \ - bus.h \ - pxa250.c \ - sa1110.c \ - ixp425.c \ cfi.c \ flash.c \ flash-intel.c \ flash-amd.c \ help.c -jtag_DEPENDENCIES = lib/libjtaglib.a tap/libtap.a part/libpart.a +jtag_DEPENDENCIES = lib/libjtaglib.a tap/libtap.a part/libpart.a bus/libbus.a -jtag_LDADD = -lreadline -lncurses -Ltap -ltap -Lpart -lpart -Llib -ljtaglib +jtag_LDADD = -lreadline -lncurses -Ltap -ltap -Lpart -lpart -Llib -ljtaglib -Lbus -lbus INCLUDES = -I$(top_srcdir)/include $(OPENWINCE_INC) -DJTAG_DATA_DIR=\"$(pkgdatadir)\" diff --git a/jtag/src/bus/.cvsignore b/jtag/src/bus/.cvsignore new file mode 100644 index 00000000..e9955884 --- /dev/null +++ b/jtag/src/bus/.cvsignore @@ -0,0 +1,3 @@ +.deps +Makefile +Makefile.in diff --git a/jtag/src/bus/Makefile.am b/jtag/src/bus/Makefile.am new file mode 100644 index 00000000..b977fb45 --- /dev/null +++ b/jtag/src/bus/Makefile.am @@ -0,0 +1,31 @@ +# +# $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 , 2003. +# + +noinst_LIBRARIES = libbus.a + +libbus_a_SOURCES = \ + ixp425.c \ + pxa2x0.c \ + sa1110.c + +INCLUDES = -I$(top_srcdir)/include $(OPENWINCE_INC) diff --git a/jtag/src/ixp425.c b/jtag/src/bus/ixp425.c similarity index 100% rename from jtag/src/ixp425.c rename to jtag/src/bus/ixp425.c diff --git a/jtag/src/pxa250.c b/jtag/src/bus/pxa2x0.c similarity index 100% rename from jtag/src/pxa250.c rename to jtag/src/bus/pxa2x0.c diff --git a/jtag/src/sa1110.c b/jtag/src/bus/sa1110.c similarity index 100% rename from jtag/src/sa1110.c rename to jtag/src/bus/sa1110.c