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

* configure.ac (AC_CONFIG_FILES): Added src/flash/Makefile.
	* include/Makefile.am (noinst_HEADERS): Added flash.h.
	* src/Makefile.am (SUBDIRS): Added flash.
	(jtag_SOURCES): Removed flash.h, flash-intel.c, and flash-amd.c.
	(jtag_LDADD): Added libflash.
	* src/flash-amd.c: Moved this file ...
	* src/flash/amd.c: ... here.
	* src/flash-intel.c: Moved this file ...
	* src/flash/intel.c: ... here.
	* src/flash.h: Moved this file ...
	* include/flash.h: ...here.
	* src/flash/Makefile.am: New file.


git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@425 b68d4a1b-bc3d-0410-92ed-d4ac073336b7

jtag/ChangeLog

@@ -1,3 +1,18 @@
+2003-05-14  Marcel Telka  <marcel@telka.sk>
+
+	* configure.ac (AC_CONFIG_FILES): Added src/flash/Makefile.
+	* include/Makefile.am (noinst_HEADERS): Added flash.h.
+	* src/Makefile.am (SUBDIRS): Added flash.
+	(jtag_SOURCES): Removed flash.h, flash-intel.c, and flash-amd.c.
+	(jtag_LDADD): Added libflash.
+	* src/flash-amd.c: Moved this file ...
+	* src/flash/amd.c: ... here.
+	* src/flash-intel.c: Moved this file ...
+	* src/flash/intel.c: ... here.
+	* src/flash.h: Moved this file ...
+	* include/flash.h: ...here.
+	* src/flash/Makefile.am: New file.
+
 2003-05-13  Marcel Telka  <marcel@telka.sk>
 
 	* src/jtag.c (jtag_parse_file): Added support for command scripts from stdin.

jtag/configure.ac

@@ -41,6 +41,7 @@ AC_CONFIG_FILES(
 	src/tap/Makefile
 	src/part/Makefile
 	src/bus/Makefile
+	src/flash/Makefile
 	po/Makefile.in
 )
 

jtag/include/Makefile.am

@@ -27,6 +27,7 @@ noinst_HEADERS = \
 	cable.h \
 	chain.h \
 	data_register.h \
+	flash.h \
 	gettext.h \
 	instruction.h \
 	parport.h \

jtag/src/Makefile.am

@@ -25,7 +25,8 @@ SUBDIRS = \
 	lib \
 	tap \
 	part \
-	bus
+	bus \
+	flash
 
 bin_PROGRAMS = \
 	jtag \
@@ -38,10 +39,7 @@ jtag_SOURCES = \
 	discovery.c \
 	readmem.c \
 	cfi.c \
-	flash.h \
 	flash.c \
-	flash-intel.c \
-	flash-amd.c \
 	help.c
 
 bsdl2jtag_SOURCES = \
@@ -49,7 +47,7 @@ bsdl2jtag_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 @LIBINTL@
+jtag_LDADD = -Ltap -ltap -Lpart -lpart -Llib -ljtaglib -Lbus -lbus -Lflash -lflash @LIBINTL@
 
 localedir = $(datadir)/locale
 INCLUDES = -DLOCALEDIR=\"$(localedir)\" -DJTAG_DATA_DIR=\"$(pkgdatadir)\"

jtag/src/flash/.cvsignore

@@ -0,0 +1,3 @@
+.deps
+Makefile
+Makefile.in

jtag/src/flash/Makefile.am

@@ -0,0 +1,28 @@
+#
+# $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.
+#
+
+noinst_LIBRARIES = libflash.a
+
+libflash_a_SOURCES = \
+	amd.c \
+	intel.c