Remove src/booklets

8 files changed, 5 insertions, 24 deletions

diff --git a/ChangeLog b/ChangeLog
index 90259139..bc2faa85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
 	* build-setup.sh (SUBDIRS): Don't extract Makefile.in for src/lisp.
 	Same for src/graph, src/etc, src/sman, src/hyper, src/doc.
 
+	(SUBDIRS): src/booklets no longer exists.
+	* configure.ac.pamphlet: Don't instantiate Makefile for
+	src/booklets. 
+
 2007-11-30  Ralf Hemmecke  <ralf@hemmecke.de>
 
 	* configure.ac.pamphlet: Fix a thinko in checking for makeindex.
diff --git a/build-setup.sh b/build-setup.sh
index 6b306a0f..49bd4e81 100755
--- a/build-setup.sh
+++ b/build-setup.sh
@@ -23,7 +23,6 @@ SUBDIRS="     .   \
 		  src/share              \
 		  src/algebra            \
 		  src/input              \
-                  src/booklets           \
 "
 
 
diff --git a/configure b/configure
index bf6f64a4..03c5102e 100755
--- a/configure
+++ b/configure
@@ -20422,9 +20422,6 @@ done
 
 if test -n "$LATEX"; then \
     axiom_src_all="$axiom_src_all all-book"
-    axiom_src_subdirs="$axiom_src_subdirs booklets"
-    ac_config_files="$ac_config_files src/booklets/Makefile:config/var-def.mk:src/booklets/Makefile.in:config/setup-dep.mk"
-
 else
     { echo "$as_me:$LINENO: Documentation is disabled." >&5
 echo "$as_me: Documentation is disabled." >&6;}
@@ -25361,7 +25358,6 @@ for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
     "config/axiom-c-macros.h") CONFIG_HEADERS="$CONFIG_HEADERS config/axiom-c-macros.h" ;;
-    "src/booklets/Makefile") CONFIG_FILES="$CONFIG_FILES src/booklets/Makefile:config/var-def.mk:src/booklets/Makefile.in:config/setup-dep.mk" ;;
     "src/clef/Makefile") CONFIG_FILES="$CONFIG_FILES src/clef/Makefile:config/var-def.mk:src/clef/Makefile.in:config/setup-dep.mk" ;;
     "src/sman/Makefile") CONFIG_FILES="$CONFIG_FILES src/sman/Makefile:config/var-def.mk:src/sman/Makefile.in:config/setup-dep.mk" ;;
     "src/graph/Makefile") CONFIG_FILES="$CONFIG_FILES src/graph/Makefile:config/var-def.mk:src/graph/Makefile.in:config/setup-dep.mk" ;;
diff --git a/configure.ac b/configure.ac
index d08eec36..25961dd3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -103,8 +103,6 @@ AC_PATH_PROG([LATEX], [latex])
 AC_CHECK_PROGS([MAKEINDEX], [makeindex])
 if test -n "$LATEX"; then \
     axiom_src_all="$axiom_src_all all-book"
-    axiom_src_subdirs="$axiom_src_subdirs booklets"
-    AXIOM_MAKEFILE([src/booklets/Makefile])
 else
     AC_MSG_NOTICE([Documentation is disabled.])
 fi
diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet
index beebbc1a..7b978c3c 100644
--- a/configure.ac.pamphlet
+++ b/configure.ac.pamphlet
@@ -704,8 +704,6 @@ AC_PATH_PROG([LATEX], [latex])
 AC_CHECK_PROGS([MAKEINDEX], [makeindex])
 if test -n "$LATEX"; then \
     axiom_src_all="$axiom_src_all all-book"
-    axiom_src_subdirs="$axiom_src_subdirs booklets"
-    AXIOM_MAKEFILE([src/booklets/Makefile])
 else
     AC_MSG_NOTICE([Documentation is disabled.])
 fi
diff --git a/src/ChangeLog b/src/ChangeLog
index 3819c0f3..4cff7364 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,7 @@
 2007-12-27  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	* booklets: Remove.
+	* Makefile.pamphlet (all-book): Remove.
 
 2007-11-25  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 0ab6dd64..bc2835dd 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -32,8 +32,6 @@ all-share:
 	cd share && ${MAKE}
 all-doc:
 	cd doc && ${MAKE}
-all-book:
-	cd booklets && ${MAKE}
 all-lib:
 	@cd lib && $(MAKE) $@
 all-lisp: all-lib
diff --git a/src/Makefile.pamphlet b/src/Makefile.pamphlet
index f7cb6918..06029371 100644
--- a/src/Makefile.pamphlet
+++ b/src/Makefile.pamphlet
@@ -92,18 +92,6 @@ all-share:
 	cd share && ${MAKE}
 @
 
-\subsection{The \File{booklets/} directory}
-
-The \File{booklets/} directory contains pamphlet files that document
-Axiom at a "higher level" than any particular pamphlet file. Booklets
-can be stand-alone descriptions (e.g. the Rosetta.pamphlet), 
-top-down slices thru the system (e.g. the Integration.pamphlet),
-or horizontal slices thru the system (e.g. the Matrix.pamphlet).
-<<bookletsdir>>=
-all-book:
-	cd booklets && ${MAKE}
-@
-
 \subsection{The \File{lib/} directory}
 
 The \File{lib/} directory is used to build \File{libspad.a} which 
@@ -274,7 +262,6 @@ stamp: @axiom_src_all@
 <<hyperdir>>
 <<sharedir>>
 <<docdir>>
-<<bookletsdir>>
 <<libdir>>
 <<lispdir>>
 <<bootdir>>