[sword-cvs] sword Makefile.am,1.38,1.39 Makefile.cvs,1.1,1.2 configure.ac,1.29,1.30

sword@www.crosswire.org sword@www.crosswire.org
Tue, 23 Dec 2003 16:07:36 -0700


Update of /cvs/core/sword
In directory www:/tmp/cvs-serv26490

Modified Files:
	Makefile.am Makefile.cvs configure.ac 
Log Message:


Index: Makefile.am
===================================================================
RCS file: /cvs/core/sword/Makefile.am,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- Makefile.am	29 Aug 2003 06:13:28 -0000	1.38
+++ Makefile.am	23 Dec 2003 23:07:34 -0000	1.39
@@ -59,7 +59,7 @@
 # Global config directory
 globalconfdir := @sysconfdir@
 
-SUBDIRS = lib . icu apps
+SUBDIRS = lib . icu
 if BUILDTESTS
 TESTSDIR = tests
 else

Index: Makefile.cvs
===================================================================
RCS file: /cvs/core/sword/Makefile.cvs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.cvs	27 Jan 2002 00:19:49 -0000	1.1
+++ Makefile.cvs	23 Dec 2003 23:07:34 -0000	1.2
@@ -1,13 +1,13 @@
 all: aclocal automake autoheader autoconf
 
 aclocal:
-	./apps/autotools/bin/aclocal --acdir=./apps/autotools/share/aclocal
+	./autotools/bin/aclocal --acdir=./autotools/share/aclocal
 
 automake:
-	-./apps/autotools/bin/automake --libdir=./apps/autotools/share/automake
+	-./autotools/bin/automake --libdir=./autotools/share/automake
 
 autoheader:
-	./apps/autotools/bin/autoheader -A ./apps/autotools/share/autoconf
+	./autotools/bin/autoheader -A ./autotools/share/autoconf
 
 autoconf:
-	./apps/autotools/bin/autoconf -A ./apps/autotools/share/autoconf
+	./autotools/bin/autoconf -A ./autotools/share/autoconf

Index: configure.ac
===================================================================
RCS file: /cvs/core/sword/configure.ac,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- configure.ac	29 Aug 2003 06:00:16 -0000	1.29
+++ configure.ac	23 Dec 2003 23:07:34 -0000	1.30
@@ -270,7 +270,7 @@
 # Final output
 # ---------------------------------------------------------------------
 AC_CONFIG_FILES(Makefile lib/Makefile tests/Makefile utilities/Makefile examples/Makefile \
-	examples/cmdline/Makefile apps/Makefile apps/console/Makefile \
-	apps/console/diatheke/Makefile icu/Makefile sword.pc)
+	examples/cmdline/Makefile \
+	utilities/diatheke/Makefile icu/Makefile sword.pc)
 AC_OUTPUT