Hi all,
please have a close look at the attached patch which removes noweb from
geda (I am not very familiar with autoconf/automake). I hope I didn't
break too much!
do not apply/use the attached patch! It only contains the changes to the
buildsystem. Not the noweb->c translations!
Use the full patch from http://mazzoo.de/d/no-noweb-full.patch.gz which
additionally to the attached contains noweb->c translations,
directory/file removals (docs, scripts, ...), ChangeLog updates, ...
matthias
diff -Nur geda-orig-cvs/devel/Makefile geda/devel/Makefile
--- geda-orig-cvs/devel/Makefile 2005-08-21 04:30:36.000000000 +0200
+++ geda/devel/Makefile 2005-10-26 19:19:21.000000000 +0200
@@ -22,7 +22,7 @@
#
# Set this to the location where you want to install gEDA/gaf
#
-prefix=$(HOME)/geda
+prefix?=$(HOME)/geda
#
# You can set any global options you want here to be passed to the
@@ -63,7 +63,6 @@
@echo "${MAKE} config Just do the ./configure --prefix=${prefix}"
@echo "${MAKE} proto Recreate all prototype.h files"
@echo "${MAKE} dist Create distribution (using make dist)"
- @echo "${MAKE} src Create all *.c files from *.nw files"
@echo "${MAKE} all Just build. Do not use! Run make install"
@echo ""
@echo ""
@@ -202,9 +201,6 @@
gattrib_reconfig gsymcheck_reconfig utils_reconfig geda_reconfig \
docs_reconfig examples_reconfig
-# This creates all *.c files from *.nw files
-src: libgeda_src gschem_src
-
# This recreates all ./configure scripts and Makefile.in files ready
# for distribution (removes dependency checking)
distconfig: libgeda_distconfig symbols_distconfig gschem_distconfig \
@@ -306,9 +302,6 @@
gschem_reconfig:
( cd $(DIR_PREFIX)gschem$(CD_VERSION); ./autogen.sh )
-gschem_src:
- ( cd $(DIR_PREFIX)gschem$(CD_VERSION)/src; ${MAKE} src )
-
gschem_distconfig:
( cd $(DIR_PREFIX)gschem$(CD_VERSION); ./autogen.sh )
@@ -603,9 +596,6 @@
libgeda_reconfig:
( cd libgeda$(CD_VERSION); ./autogen.sh )
-libgeda_src:
- ( cd libgeda$(CD_VERSION)/src; ${MAKE} src )
-
libgeda_distconfig:
( cd libgeda$(CD_VERSION); ./autogen.sh )
diff -Nur geda-orig-cvs/devel/README.sol10 geda/devel/README.sol10
--- geda-orig-cvs/devel/README.sol10 2005-03-13 00:29:32.000000000 +0100
+++ geda/devel/README.sol10 2005-10-23 15:05:04.000000000 +0200
@@ -29,17 +29,12 @@
4) Install guile 1.6.7 from source. Don't try to use an earlier version; they
won't work. http://www.gnu.org/software/guile
-5) Install noweb 2.10a. I could not get the noweb guile versions to work
- out of the box, so I just built the real noweb and that worked in all case.
- http://www.eecs.harvard.edu/~nr/noweb/USA.html or
- http://geda.seul.org/devel/support/
-
-6) Install transfig. This was truely unpleasant as transfig uses imake to
+5) Install transfig. This was truely unpleasant as transfig uses imake to
configure itself. I have forgotten how difficult imake can be when it
breaks. Anybody who badmouths the auto* tools should be forced to work
with a broken imake/xmkmf. http://www.xfig.org/xfigdist/
-7) Solaris 10 shipped with some empty/broken *.la files. Replace the
+6) Solaris 10 shipped with some empty/broken *.la files. Replace the
following empty files:
/usr/sfw/lib/libstdc++.la
diff -Nur geda-orig-cvs/devel/gschem/Makefile.am geda/devel/gschem/Makefile.am
--- geda-orig-cvs/devel/gschem/Makefile.am 2004-01-18 02:52:33.000000000 +0100
+++ geda/devel/gschem/Makefile.am 2005-10-26 20:45:42.000000000 +0200
@@ -1,6 +1,6 @@
-SUBDIRS = include lib intl src m4 po scheme bitmap scripts examples noweb \
- tests docs
+SUBDIRS = include lib intl src m4 po scheme bitmap scripts examples \
+ tests docs
EXTRA_DIST = VOCABULARY BUGS autogen.sh
diff -Nur geda-orig-cvs/devel/gschem/configure.ac geda/devel/gschem/configure.ac
--- geda-orig-cvs/devel/gschem/configure.ac 2005-10-16 04:15:28.000000000 +0200
+++ geda/devel/gschem/configure.ac 2005-10-27 08:48:15.000000000 +0200
@@ -1,6 +1,6 @@
# Process this file with autoconf to produce a configure script.
AC_INIT
-AC_CONFIG_SRCDIR([noweb/gschem.nw])
+AC_CONFIG_SRCDIR([src/gschem.c])
AC_PREREQ(2.54)
PACKAGE=geda-gschem
@@ -315,154 +315,6 @@
# Check for libstroke end
############################################################################
-############################################################################
-# Check for notangle, noweave, texi2html, indent start
-#
-
-# Tangling is required if there is no C source files in the src/
-# directory. Therefore they need to be extracted from the documented
-# sources in noweb/ either with notangle or notangle_guile.
-#
-# notangle is the utility that comes with the noweb package.
-# notangle_guile is a script that act the same as notangle
-# but only require a guile interpreter with built-in module regex
-# and getopt-long
-
-# search for notangle
-AC_PATH_PROG(NOTANGLE, notangle, no, ${PATH})
-cfiles=`\ls -1 src/libgeda.c 2> /dev/null`
-exit_status=$?
-
-if test "$NOTANGLE" = "no" -a "$exit_status" = "1"; then
-
- # notangle not found, and no C sources in src
- # need notangle_guile
- echo "** Cannot find notangle (part of noweb) : using notangle_guile instead **"
-
- # find the guile interpreter
- AC_PATH_PROG(GUILEINTERP, guile, no, ${PATH})
- if test "$GUILEINTERP" = "no"; then
- AC_MSG_ERROR([guile interpreter is required])
- fi
-
- # check (ice-9 getopt-long) module in guile
- AC_MSG_CHECKING([for getopt-long module in guile])
- guilegetopt=`$GUILEINTERP -c '(use-modules (ice-9 getopt-long))' 2> /dev/null`
- exit_status=$?
- if test "$exit_status" = "1"; then
- AC_MSG_RESULT([no])
- echo "no support for getopt-long module in guile interpreter"
- AC_MSG_ERROR([this module is required by notangle_guile but is not available in the interpreter])
- fi
- AC_MSG_RESULT([yes])
-
- # check (ice-9 regex) module in guile
- AC_MSG_CHECKING([for regex module in guile])
- guileregex=`$GUILEINTERP -c '(use-modules (ice-9 regex))' 2> /dev/null`
- exit_status=$?
- if test ! "$exit_status" = "0"; then
- AC_MSG_RESULT([no])
- echo "no support for regex module in guile interpreter"
- AC_MSG_ERROR([this module is required by notangle_guile but is not available in the interpreter])
- fi
- AC_MSG_RESULT([yes])
-
- # set NOTANGLE and NOTANGLEROOT to use notangle_guile
- # as the result of the previous tests
- # - NOTANGLE is the relative pathname to script from the source dir
- # - NOTANGLEROOT is the option to give the root code chunk name
- # - NOTANGLEFLAGS are other flags to notangle_guile
- NOTANGLE="../scripts/notangle_guile"
- NOTANGLEROOT="--rootname="
- NOTANGLEFLAGS=""
-
- echo "-- notangle_guile should work fine on this system --"
-
-else
-
- # NOTANGLE has been set by AC_PATH_PROG above
- NOTANGLEROOT="-R"
- NOTANGLEFLAGS="-L"
-
-fi
-
-# Weaving is extracting the documentation from the noweb files.
-# The noweb package provides noweave to weave these files.
-#
-# The documentation is here written in Texinfo. A backend is
-# provided in scripts to format the code chunks in Texinfo.
-#
-# The noweave program is therefore required to produce the
-# documentation but building documentation is optionnal.
-#
-
-# search for noweave
-AC_PATH_PROG(NOWEAVE, noweave, no, ${PATH})
-# search for AWK
-# the noweb texinfo backend is based on awk. If awk is not available,
-# the backend will not work, and therefore it disables the
-# documentation creation.
-AC_PROG_AWK
-
-if test "$NOWEAVE" = "no" -o "$AWK" = "no"; then
- # noweave is not available on the system
- echo "** Cannot find noweave (part of noweb)! **"
- echo "** Documentation creation disabled **"
- NOWEAVE=echo
-
- # prevent from weaving the nw files
- # but does not prevent from processing gschemdoc
- builddoc=false
-else
- # noweave is available on the system.
- # now checking if the tools for Texinfo files processing
- # is installed.
- # The docs can be either processed to produce dvi, html or info
- # with texi2dvi, texi2html or makeinfo respectively
- # Note : these tests on makeinfo and texi2dvi are no more
- # needed as automake makes them for us
-
- # enable the weaving of the nw files to get documentation
- builddoc=true
-fi
-
-# depending on variable builddoc, weaving is performed or not
-# using conditionnal in docs/Makefile.in
-AM_CONDITIONAL(BUILDDOC, test x$builddoc = xtrue)
-
-# search for texi2html
-# it looks like automake does not take care of html doc creation
-AC_PATH_PROG(TEXI2HTML, texi2html, no, ${PATH})
-
-if test "$TEXI2HTML" = "no"; then
- echo "** Cannot find texi2html **"
- echo "** HTML file creation disabled **"
- TEXI2HTML=echo
-fi
-
-# search for indent
-AC_PATH_PROG(INDENT, indent, no, ${PATH})
-
-if ! test "$INDENT" = "no"; then
- indentversion=`$INDENT --version | grep GNU`
-else
- indentversion=
-fi
-
-if test "$INDENT" = "no" -o "$indentversion"x = x; then
- AC_PATH_PROG(GINDENT, gindent, no, ${PATH})
- if test "$GINDENT" = "no"; then
- echo "** Cannot find GNU indent or gindent, C code formatting disabled **"
- INDENT=echo
- else
- INDENT=$GINDENT
- fi
-fi
-
-#
-# Check for notangle, noweave, texi2html, indent end
-#########################################################################
-
#########################################################################
# Check for groff start
#
@@ -619,13 +471,6 @@
AC_SUBST(GEDARCDIR)
AC_SUBST(PATHSEP)
AC_SUBST(OTHERPATHSEP)
-AC_SUBST(NOTANGLE)
-AC_SUBST(NOTANGLEROOT)
-AC_SUBST(NOTANGLEFLAGS)
-AC_SUBST(GUILEINTERP)
-AC_SUBST(NOWEAVE)
-AC_SUBST(TEXI2HTML)
-AC_SUBST(INDENT)
# Create all the necessary derived files
AC_CONFIG_FILES([Makefile
@@ -640,14 +485,9 @@
examples/Makefile
docs/Makefile
lib/Makefile
- noweb/Makefile
tests/Makefile
- lib/system-gschemrc
- scripts/geda_totexi
- scripts/notangle_guile ])
+ lib/system-gschemrc ])
-AC_CONFIG_COMMANDS([geda_totexi-chmod],[[chmod +x scripts/geda_totexi]],[[]])
-AC_CONFIG_COMMANDS([notangle_guile-chmod],[[chmod +x scripts/notangle_guile]],[[]])
AC_OUTPUT
diff -Nur geda-orig-cvs/devel/gschem/docs/Makefile.am geda/devel/gschem/docs/Makefile.am
--- geda-orig-cvs/devel/gschem/docs/Makefile.am 2005-01-16 05:32:10.000000000 +0100
+++ geda/devel/gschem/docs/Makefile.am 2005-10-27 08:42:11.000000000 +0200
@@ -1,54 +1,14 @@
-NOWEAVE = @NOWEAVE@
-NOWEAVEFLAGS = -n -index -t4
-TEXIBACKEND = ../scripts/geda_totexi
-
-TEXI2HTML = @TEXI2HTML@
-TEXI2HTMLFLAGS = -split_chapter
-
man_MANS = gschem.1
-EXTRA_DIST = gschemdoc.texi texinfo.tex gschem.1 gschem.html
-
-BUILT_SOURCES = gschem.html
+EXTRA_DIST = gschem.1
docsdir = @GEDADOCDIR@/man
docs_DATA = gschem.html
-info_TEXINFOS = gschemdoc.texi
-gschemdoc_TEXINFOS = a_pan.texi a_zoom.texi g_funcs.texi g_hook.texi \
- g_keys.texi g_rc.texi g_register.texi globals.texi \
- gschem.texi i_basic.texi i_callbacks.texi i_vars.texi \
- o_arc.texi o_attrib.texi o_basic.texi o_box.texi \
- o_buffer.texi o_bus.texi o_circle.texi o_complex.texi \
- o_copy.texi o_cue.texi o_delete.texi o_find.texi \
- o_grips.texi o_line.texi o_misc.texi o_move.texi \
- o_net.texi o_pin.texi o_select.texi o_slot.texi \
- o_text.texi o_undo.texi parsecmd.texi \
- x_basic.texi x_color.texi x_dialog.texi x_event.texi \
- x_fileselect.texi x_grid.texi x_image.texi x_log.texi \
- x_menus.texi x_pagesel.texi \
- x_preview.texi x_print.texi x_script.texi \
- x_stroke.texi x_window.texi x_attribedit.texi \
- x_multiattrib.texi
-TEXINFO_TEX = ./texinfo.tex
-
-
-VPATH = ../noweb:docs
-SUFFIXES = .nw .texi
-
-.nw.texi:
- @echo 'Processing $@ ...'
-if BUILDDOC
- $(NOWEAVE) $(NOWEAVEFLAGS) -backend $(TEXIBACKEND) $< > $@
-else
- @echo '@node File $(@:.texi=.c),,,Top' > $@
- @echo '@chapter File @file{$(@:.texi=.c)}' >> $@
- @echo 'Noweave (part of noweb) is not installed on your system.' >> $@
- @echo 'The documentation can not be built from the sources.' >> $@
-endif
+VPATH = docs
-html: $(gschemdoc_TEXINFOS) $(info_TEXINFOS)
+html: $(info_TEXINFOS)
$(TEXI2HTML) $(TEXI2HTMLFLAGS) $(info_TEXINFOS)
%.html: %.1
@@ -65,7 +25,6 @@
gschem.html: gschem.1
-
MOSTLYCLEANFILES = *.log *~ gschem.html
CLEANFILES = *.log *~ gschem.html
DISTCLEANFILES = *.log core FILE *~ prototype.bak \
diff -Nur geda-orig-cvs/devel/gschem/scripts/Makefile.am geda/devel/gschem/scripts/Makefile.am
--- geda-orig-cvs/devel/gschem/scripts/Makefile.am 2005-02-24 23:07:47.000000000 +0100
+++ geda/devel/gschem/scripts/Makefile.am 2005-10-26 19:24:11.000000000 +0200
@@ -1,9 +1,8 @@
-EXTRA_DIST = ChangeLog geda_totexi.in makeallimages \
- makeimages print.scm image.scm notangle_guile.in
+EXTRA_DIST = ChangeLog makeallimages \
+ makeimages print.scm image.scm
MOSTLYCLEANFILES = *.log *~
CLEANFILES = *.log *~
-DISTCLEANFILES = *.log core FILE *~ prototype.bak \
- geda_totexi notangle_guile
+DISTCLEANFILES = *.log core FILE *~ prototype.bak
MAINTAINERCLEANFILES = *.log *~ Makefile.in configure
diff -Nur geda-orig-cvs/devel/gschem/src/Makefile.am geda/devel/gschem/src/Makefile.am
--- geda-orig-cvs/devel/gschem/src/Makefile.am 2005-02-22 23:13:28.000000000 +0100
+++ geda/devel/gschem/src/Makefile.am 2005-10-26 19:30:24.000000000 +0200
@@ -4,36 +4,29 @@
# level Makefile.
#
-NOTANGLE= @NOTANGLE@
-NOTANGLEROOT= @NOTANGLEROOT@
-NOTANGLEFLAGS= @NOTANGLEFLAGS@
-
-INDENTBIN= @INDENT@
-INDENTFLAG= -kr -i2
-
-VPATH = ../noweb:../include:src
+VPATH = ../include:src
bin_PROGRAMS = gschem
BUILT_SOURCES = \
- a_pan.nw a_zoom.nw \
- g_register.nw g_hook.nw\
- g_rc.nw g_keys.nw g_funcs.nw \
- globals.nw gschem.nw \
- i_basic.nw i_callbacks.nw i_vars.nw \
- o_basic.nw o_attrib.nw o_move.nw o_copy.nw o_delete.nw o_misc.nw \
- o_slot.nw o_grips.nw \
- o_arc.nw o_box.nw o_circle.nw o_complex.nw o_select.nw o_find.nw \
- o_line.nw o_net.nw o_text.nw o_pin.nw o_bus.nw o_buffer.nw o_undo.nw \
- o_picture.nw \
- x_basic.nw x_dialog.nw \
- x_event.nw x_grid.nw x_log.nw x_menus.nw x_script.nw \
- x_pagesel.nw x_print.nw x_window.nw x_stroke.nw x_image.nw x_color.nw \
- x_fileselect.nw x_preview.nw x_attribedit.nw \
- x_multiattrib.nw \
- parsecmd.nw o_cue.nw
+ a_pan.c a_zoom.c \
+ g_register.c g_hook.c\
+ g_rc.c g_keys.c g_funcs.c \
+ globals.c gschem.c \
+ i_basic.c i_callbacks.c i_vars.c \
+ o_basic.c o_attrib.c o_move.c o_copy.c o_delete.c o_misc.c \
+ o_slot.c o_grips.c \
+ o_arc.c o_box.c o_circle.c o_complex.c o_select.c o_find.c \
+ o_line.c o_net.c o_text.c o_pin.c o_bus.c o_buffer.c o_undo.c \
+ o_picture.c \
+ x_basic.c x_dialog.c \
+ x_event.c x_grid.c x_log.c x_menus.c x_script.c \
+ x_pagesel.c x_print.c x_window.c x_stroke.c x_image.c x_color.c \
+ x_fileselect.c x_preview.c x_attribedit.c \
+ x_multiattrib.c \
+ parsecmd.c o_cue.c
-gschem_SOURCES = $(BUILT_SOURCES:.nw=.c)
+gschem_SOURCES = $(BUILT_SOURCES)
if CCISGCC
AM_CFLAGS = -Wall
@@ -52,12 +45,8 @@
src: $(gschem_SOURCES)
@echo Finished building the C source
-SUFFIXES = .nw
+SUFFIXES = .c
-.nw.c:
- $(NOTANGLE) $(NOTANGLEFLAGS) $(NOTANGLEROOT)'$@ : *' $< > ../src/$@
- $(INDENTBIN) $(INDENTFLAG) ../src/$@
- rm -f ../src/[EMAIL PROTECTED]
CPROTO = cproto
CPROTOCFLAGS = $(INCLUDES) -I. -I.. -I../include
@@ -73,7 +62,7 @@
rm -f po/$(PACKAGE).pot
@mv -f po/POTFILES.in po/POTFILES.in~ ; true
grep '\([^A-Za-z0-9_]_(\)\|\(^_(\)\|\(gettext[[:blank:]]*(\)' \
- noweb/*.nw | cut -d: -f1 | sort -u >po/POTFILES.in
+ src/*.c | cut -d: -f1 | sort -u >po/POTFILES.in
$(MAKE)
MOSTLYCLEANFILES = *.log core FILE *~ prototype.bak
diff -Nur geda-orig-cvs/devel/gschem/tests/Makefile.am geda/devel/gschem/tests/Makefile.am
--- geda-orig-cvs/devel/gschem/tests/Makefile.am 2005-03-07 03:11:35.000000000 +0100
+++ geda/devel/gschem/tests/Makefile.am 2005-10-26 19:28:20.000000000 +0200
@@ -13,6 +13,5 @@
MOSTLYCLEANFILES = *.log *~
CLEANFILES = *.log *~
-DISTCLEANFILES = *.log core FILE *~ prototype.bak \
- geda_totexi notangle_guile.scm
+DISTCLEANFILES = *.log core FILE *~ prototype.bak
MAINTAINERCLEANFILES = *.log *~ Makefile.in configure
diff -Nur geda-orig-cvs/devel/libgeda/Makefile.am geda/devel/libgeda/Makefile.am
--- geda-orig-cvs/devel/libgeda/Makefile.am 2004-01-18 02:52:33.000000000 +0100
+++ geda/devel/libgeda/Makefile.am 2005-10-26 22:51:58.000000000 +0200
@@ -1,5 +1,5 @@
-SUBDIRS = src include noweb scripts docs
+SUBDIRS = src include
EXTRA_DIST = HACKING BUGS autogen.sh
diff -Nur geda-orig-cvs/devel/libgeda/configure.ac geda/devel/libgeda/configure.ac
--- geda-orig-cvs/devel/libgeda/configure.ac 2005-08-20 04:43:46.000000000 +0200
+++ geda/devel/libgeda/configure.ac 2005-10-26 22:58:46.000000000 +0200
@@ -308,156 +308,6 @@
# Check for gdk-pixbuf end
############################################################################
-
-
-############################################################################
-# Check for notangle, noweave, texi2html, indent start
-#
-
-# Tangling is required if there is no C source files in the src/
-# directory. Therefore they need to be extracted from the documented
-# sources in noweb/ either with notangle or notangle_guile.
-#
-# notangle is the utility that comes with the noweb package.
-# notangle_guile is a script that act the same as notangle
-# but only require a guile interpreter with built-in module regex
-# and getopt-long
-
-# search for notangle
-AC_PATH_PROG(NOTANGLE, notangle, no, ${PATH})
-cfiles=`\ls -1 src/libgeda.c 2> /dev/null`
-exit_status=$?
-
-if test "$NOTANGLE" = "no" -a "$exit_status" = "1"; then
-
- # notangle not found, and no C sources in src
- # need notangle_guile
- echo "** Cannot find notangle (part of noweb) : using notangle_guile instead **"
-
- # find the guile interpreter
- AC_PATH_PROG(GUILEINTERP, guile, no, ${PATH})
- if test "$GUILEINTERP" = "no"; then
- AC_MSG_ERROR([guile interpreter is required])
- fi
-
- # check (ice-9 getopt-long) module in guile
- AC_MSG_CHECKING([for getopt-long module in guile])
- guilegetopt=`$GUILEINTERP -c '(use-modules (ice-9 getopt-long))' 2> /dev/null`
- exit_status=$?
- if test "$exit_status" = "1"; then
- AC_MSG_RESULT([no])
- echo "no support for getopt-long module in guile interpreter"
- AC_MSG_ERROR([this module is required by notangle_guile but is not available in the interpreter])
- fi
- AC_MSG_RESULT([yes])
-
- # check (ice-9 regex) module in guile
- AC_MSG_CHECKING([for regex module in guile])
- guileregex=`$GUILEINTERP -c '(use-modules (ice-9 regex))' 2> /dev/null`
- exit_status=$?
- if test ! "$exit_status" = "0"; then
- AC_MSG_RESULT([no])
- echo "no support for regex module in guile interpreter"
- AC_MSG_ERROR([this module is required by notangle_guile but is not available in the interpreter])
- fi
- AC_MSG_RESULT([yes])
-
- # set NOTANGLE and NOTANGLEROOT to use notangle_guile
- # as the result of the previous tests
- # - NOTANGLE is the relative pathname to script from the source dir
- # - NOTANGLEROOT is the option to give the root code chunk name
- # - NOTANGLEFLAGS are other flags to notangle_guile
- NOTANGLE="../scripts/notangle_guile"
- NOTANGLEROOT="--rootname="
- NOTANGLEFLAGS=""
-
- echo "-- notangle_guile should work fine on this system --"
-
-else
-
- # NOTANGLE has been set by AC_PATH_PROG above
- NOTANGLEROOT="-R"
- NOTANGLEFLAGS="-L"
-
-fi
-
-# Weaving is extracting the documentation from the noweb files.
-# The noweb package provides noweave to weave these files.
-#
-# The documentation is here written in Texinfo. A backend is
-# provided in scripts to format the code chunks in Texinfo.
-#
-# The noweave program is therefore required to produce the
-# documentation but building documentation is optionnal.
-#
-
-# search for noweave
-AC_PATH_PROG(NOWEAVE, noweave, no, ${PATH})
-# search for AWK
-# the noweb texinfo backend is based on awk. If awk is not available,
-# the backend will not work, and therefore it disables the
-# documentation creation.
-AC_PROG_AWK
-
-if test "$NOWEAVE" = "no" -o "$AWK" = "no"; then
- # noweave is not available on the system
- echo "** Cannot find noweave (part of noweb)! **"
- echo "** Documentation creation disabled **"
- NOWEAVE=echo
-
- # prevent from weaving the nw files
- # but does not prevent from processing gschemdoc
- builddoc=false
-else
- # noweave is available on the system.
- # now checking if the tools for Texinfo files processing
- # is installed.
- # The docs can be either processed to produce dvi, html or info
- # with texi2dvi, texi2html or makeinfo respectively
- # Note : these tests on makeinfo and texi2dvi are no more
- # needed as automake makes them for us
-
- # enable the weaving of the nw files to get documentation
- builddoc=true
-fi
-
-# depending on variable builddoc, weaving is performed or not
-# using conditionnal in docs/Makefile.in
-AM_CONDITIONAL(BUILDDOC, test x$builddoc = xtrue)
-
-# search for texi2html
-# it looks like automake does not take care of html doc creation
-AC_PATH_PROG(TEXI2HTML, texi2html, no, ${PATH})
-
-if test "$TEXI2HTML" = "no"; then
- echo "** Cannot find texi2html **"
- echo "** HTML file creation disabled **"
- TEXI2HTML=echo
-fi
-
-# search for indent
-AC_PATH_PROG(INDENT, indent, no, ${PATH})
-
-if ! test "$INDENT" = "no"; then
- indentversion=`$INDENT --version | grep GNU`
-else
- indentversion=
-fi
-
-if test "$INDENT" = "no" -o "$indentversion"x = x; then
- AC_PATH_PROG(GINDENT, gindent, no, ${PATH})
- if test "$GINDENT" = "no"; then
- echo "** Cannot find GNU indent or gindent, C code formatting disabled **"
- INDENT=echo
- else
- INDENT=$GINDENT
- fi
-fi
-
-#
-# Check for notangle, noweave, texi2html, indent end
-#########################################################################
-
#########################################################################
# Checks for header files start
#
@@ -593,29 +443,12 @@
AC_SUBST(GEDARCDIR)
AC_SUBST(PATHSEP)
AC_SUBST(OTHERPATHSEP)
-AC_SUBST(NOTANGLE)
-AC_SUBST(NOTANGLEROOT)
-AC_SUBST(NOTANGLEFLAGS)
-AC_SUBST(GUILEINTERP)
-AC_SUBST(NOWEAVE)
-AC_SUBST(TEXI2HTML)
-AC_SUBST(INDENT)
# Create all the necessary derived files
AC_CONFIG_FILES([Makefile
src/Makefile
- noweb/Makefile
- scripts/Makefile
include/Makefile
- docs/Makefile
- libgeda.pc
- scripts/geda_totexi
- scripts/notangle_guile ])
-
-AC_CONFIG_COMMANDS([geda_totexi-chmod],
- [[chmod +x scripts/geda_totexi]],[[]])
-AC_CONFIG_COMMANDS([notangle_guile-chmod],
- [[chmod +x scripts/notangle_guile]],[[]])
+ libgeda.pc ])
AC_OUTPUT
diff -Nur geda-orig-cvs/devel/libgeda/src/Makefile.am geda/devel/libgeda/src/Makefile.am
--- geda-orig-cvs/devel/libgeda/src/Makefile.am 2005-10-01 00:01:53.000000000 +0200
+++ geda/devel/libgeda/src/Makefile.am 2005-10-26 19:29:18.000000000 +0200
@@ -5,14 +5,7 @@
# level Makefile.
AUTOMAKE_OPTIONS = foreign
-NOTANGLE= @NOTANGLE@
-NOTANGLEROOT= @NOTANGLEROOT@
-NOTANGLEFLAGS= @NOTANGLEFLAGS@
-
-INDENTBIN= @INDENT@
-INDENTFLAG= -kr -i2
-
-VPATH = ../noweb:../include:src
+VPATH = ../include:src
if CCISGCC
AM_CFLAGS = -Wall
@@ -22,18 +15,18 @@
lib_LTLIBRARIES = libgeda.la
BUILT_SOURCES = \
- a_basic.nw f_basic.nw f_print.nw f_image.nw g_basic.nw m_basic.nw \
- o_arc_basic.nw o_attrib.nw o_basic.nw o_box_basic.nw \
- o_circle_basic.nw o_complex_basic.nw o_line_basic.nw o_list.nw \
- o_net_basic.nw o_selection.nw o_bus_basic.nw o_text_basic.nw \
- o_pin_basic.nw o_image.nw u_basic.nw s_attrib.nw s_basic.nw \
- s_clib.nw s_encoding.nw s_hierarchy.nw s_papersizes.nw s_stretch.nw \
- s_log.nw \
- s_page.nw s_slib.nw s_color.nw s_undo.nw s_conn.nw \
- s_cue.nw s_tile.nw s_menu.nw s_toplevel.nw g_smob.nw libgeda.nw \
- g_register.nw g_rc.nw i_vars.nw o_picture.nw gdk-pixbuf-hacks.nw
+ a_basic.c f_basic.c f_print.c f_image.c g_basic.c m_basic.c \
+ o_arc_basic.c o_attrib.c o_basic.c o_box_basic.c \
+ o_circle_basic.c o_complex_basic.c o_line_basic.c o_list.c \
+ o_net_basic.c o_selection.c o_bus_basic.c o_text_basic.c \
+ o_pin_basic.c o_image.c u_basic.c s_attrib.c s_basic.c \
+ s_clib.c s_encoding.c s_hierarchy.c s_papersizes.c s_stretch.c \
+ s_log.c \
+ s_page.c s_slib.c s_color.c s_undo.c s_conn.c \
+ s_cue.c s_tile.c s_menu.c s_toplevel.c g_smob.c libgeda.c \
+ g_register.c g_rc.c i_vars.c o_picture.c gdk-pixbuf-hacks.c
-libgeda_la_SOURCES = $(BUILT_SOURCES:.nw=.c)
+libgeda_la_SOURCES = $(BUILT_SOURCES)
INCLUDES = -I$(top_srcdir)/include @LIBGEDA_CFLAGS@
libgeda_la_LDFLAGS = @LIBTOOL_FLAGS@ @LIBGEDA_LDFLAGS@
@@ -41,17 +34,10 @@
EXTRA_DIST = create_proto
-TEXIFILES = $(BUILT_SOURCES:.nw=.texi)
-
src: $(libgeda_la_SOURCES)
@echo Finished building the C source
-SUFFIXES = .nw
-
-.nw.c:
- $(NOTANGLE) $(NOTANGLEFLAGS) $(NOTANGLEROOT)'$@ : *' $< > ../src/$@
- $(INDENTBIN) $(INDENTFLAG) ../src/$@
- rm -f ../src/[EMAIL PROTECTED]
+SUFFIXES = .c
CPROTO = cproto
CPROTOCFLAGS = $(INCLUDES) -I. -I.. -I../include
