[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.5.2-20090328-192-gff6ea49)
The branch, master has been updated
via ff6ea4955d0490d6436bc74d840325e76098304f (commit)
via cf772193f3042184e5ca624cc7b1e8daef6f4a53 (commit)
from 7b2ec0b1da38f6f078de4bb1ef61d100d9a5972e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
Makefile.am | 9 +++++++-
configure.ac | 1 -
gattrib/src/g_rc.c | 3 --
gattrib/src/s_visibility.c | 4 ---
gattrib/src/x_fileselect.c | 4 ---
gnetlist/docs/Makefile.am | 46 +++++++++++++++++++++----------------------
gnetlist/src/g_rc.c | 3 --
gnetlist/src/gnetlist.c | 2 -
gschem/docs/Makefile.am | 29 ++++++++++++++++++++++----
gschem/src/g_rc.c | 3 --
gschem/src/x_compselect.c | 3 --
gsymcheck/docs/Makefile.am | 26 +++++++++++++++---------
gsymcheck/src/g_rc.c | 3 --
libgeda/src/g_rc.c | 3 --
libgeda/src/s_menu.c | 3 --
libgeda/src/s_slib.c | 2 -
utils/gschlas/g_rc.c | 3 --
utils/man/Makefile.am | 24 ++++++++++++++++++++--
18 files changed, 91 insertions(+), 80 deletions(-)
=================
Commit Messages
=================
commit ff6ea4955d0490d6436bc74d840325e76098304f
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
build-sys: Don't use AC_HEADER_DIRENT.
The Autoconf manual says that AC_HEADER_DIRENT is now unnecessary:
This macro is obsolescent, as all current systems with directory
libraries have `dirent.h'. New programs need not use this
macro.
This patch removes AC_HEADER_DIRENT and all checks for HAVE_DIRENT_H.
It turned out that in most of the places where `dirent.h' was being
#include'd it wasn't needed anyway.
(Fix for a Cygwin build bug reported by Dan McMahill).
:100644 100644 caee37d... 73783d8... M configure.ac
:100644 100644 c7eee48... 438422a... M gattrib/src/g_rc.c
:100644 100644 083ca5f... 46be506... M gattrib/src/s_visibility.c
:100644 100644 e7eeca1... d904794... M gattrib/src/x_fileselect.c
:100644 100644 ea3b2cc... 307f855... M gnetlist/src/g_rc.c
:100644 100644 99c0a59... fbc86a8... M gnetlist/src/gnetlist.c
:100644 100644 b9d4de9... 0d7eb94... M gschem/src/g_rc.c
:100644 100644 1d2b605... 931c2c1... M gschem/src/x_compselect.c
:100644 100644 97eb4cb... 10bc07d... M gsymcheck/src/g_rc.c
:100644 100644 f4fb565... c7f5d83... M libgeda/src/g_rc.c
:100644 100644 2021290... 582849f... M libgeda/src/s_menu.c
:100644 100644 7074803... ffbc99b... M libgeda/src/s_slib.c
:100644 100644 f733fb5... 8c46ab6... M utils/gschlas/g_rc.c
commit cf772193f3042184e5ca624cc7b1e8daef6f4a53
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
build-sys: Improve HTML conversion rules.
We want to make sure the HTML version of the man pages is always
distributed, but make building/installing it optional (in case users
don't have a proper groff installed).
This can be achieved by making sure that Automake only tries to
install the HTML man pages if a working groff is available. In
addition, `make distcheck' is set up to behave as if groff is not
installed.
Unfortunately, this still isn't ideal, because users who build from a
source archive (with pre-built HTML) won't get HTML installed unless
they have a working groff.
In the long run, what needs to happen is to use a mechanism like
`missing' to handle rebuilding of HTML man pages -- or just drop HTML
man pages altogether.
:100644 100644 dbfdbd3... 8e112f4... M Makefile.am
:100644 100644 9b71345... bc13eff... M gnetlist/docs/Makefile.am
:100644 100644 6869b31... ffba327... M gschem/docs/Makefile.am
:100644 100644 366b828... e3edaa1... M gsymcheck/docs/Makefile.am
:100644 100644 73abce2... 47f7833... M utils/man/Makefile.am
=========
Changes
=========
commit ff6ea4955d0490d6436bc74d840325e76098304f
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
build-sys: Don't use AC_HEADER_DIRENT.
The Autoconf manual says that AC_HEADER_DIRENT is now unnecessary:
This macro is obsolescent, as all current systems with directory
libraries have `dirent.h'. New programs need not use this
macro.
This patch removes AC_HEADER_DIRENT and all checks for HAVE_DIRENT_H.
It turned out that in most of the places where `dirent.h' was being
#include'd it wasn't needed anyway.
(Fix for a Cygwin build bug reported by Dan McMahill).
diff --git a/configure.ac b/configure.ac
index caee37d..73783d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,7 +93,6 @@ AC_HEADER_SYS_WAIT
# FIXME these checks are obsolete, because every plausible platform
# provides what they check for.
AC_HEADER_STDC
-AC_HEADER_DIRENT
# FIXME these checks may be pointless for one of three reasons: every
# even vaguely sane libc implementation provides them; we don't use
diff --git a/gattrib/src/g_rc.c b/gattrib/src/g_rc.c
index c7eee48..438422a 100644
--- a/gattrib/src/g_rc.c
+++ b/gattrib/src/g_rc.c
@@ -33,9 +33,6 @@
#ifdef HAVE_STRING_H
#include <string.h>
#endif
-#ifdef HAVE_DIRENT_H
-#include <dirent.h>
-#endif
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
diff --git a/gattrib/src/s_visibility.c b/gattrib/src/s_visibility.c
index 083ca5f..46be506 100644
--- a/gattrib/src/s_visibility.c
+++ b/gattrib/src/s_visibility.c
@@ -54,10 +54,6 @@
#include <unistd.h>
#endif
-#ifdef HAVE_DIRENT_H
-#include <dirent.h>
-#endif
-
#ifdef HAVE_STRING_H
#include <string.h>
#endif
diff --git a/gattrib/src/x_fileselect.c b/gattrib/src/x_fileselect.c
index e7eeca1..d904794 100644
--- a/gattrib/src/x_fileselect.c
+++ b/gattrib/src/x_fileselect.c
@@ -53,10 +53,6 @@
#include <unistd.h>
#endif
-#ifdef HAVE_DIRENT_H
-#include <dirent.h>
-#endif
-
#ifdef HAVE_STRING_H
#include <string.h>
#endif
diff --git a/gnetlist/src/g_rc.c b/gnetlist/src/g_rc.c
index ea3b2cc..307f855 100644
--- a/gnetlist/src/g_rc.c
+++ b/gnetlist/src/g_rc.c
@@ -30,9 +30,6 @@
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
-#ifdef HAVE_DIRENT_H
-#include <dirent.h>
-#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
diff --git a/gnetlist/src/gnetlist.c b/gnetlist/src/gnetlist.c
index 99c0a59..fbc86a8 100644
--- a/gnetlist/src/gnetlist.c
+++ b/gnetlist/src/gnetlist.c
@@ -27,9 +27,7 @@
#ifdef HAVE_ERRNO_H
#include <errno.h>
#endif
-#ifdef HAVE_DIRENT_H
#include <dirent.h>
-#endif
#ifdef HAVE_STRING_H
#include <string.h>
#endif
diff --git a/gschem/src/g_rc.c b/gschem/src/g_rc.c
index b9d4de9..0d7eb94 100644
--- a/gschem/src/g_rc.c
+++ b/gschem/src/g_rc.c
@@ -26,9 +26,6 @@
#ifdef HAVE_STRING_H
#include <string.h>
#endif
-#ifdef HAVE_DIRENT_H
-#include <dirent.h>
-#endif
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
diff --git a/gschem/src/x_compselect.c b/gschem/src/x_compselect.c
index 1d2b605..931c2c1 100644
--- a/gschem/src/x_compselect.c
+++ b/gschem/src/x_compselect.c
@@ -29,9 +29,6 @@
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
-#ifdef HAVE_DIRENT_H
-#include <dirent.h>
-#endif
#ifdef HAVE_STRING_H
#include <string.h>
#endif
diff --git a/gsymcheck/src/g_rc.c b/gsymcheck/src/g_rc.c
index 97eb4cb..10bc07d 100644
--- a/gsymcheck/src/g_rc.c
+++ b/gsymcheck/src/g_rc.c
@@ -30,9 +30,6 @@
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
-#ifdef HAVE_DIRENT_H
-#include <dirent.h>
-#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
diff --git a/libgeda/src/g_rc.c b/libgeda/src/g_rc.c
index f4fb565..c7f5d83 100644
--- a/libgeda/src/g_rc.c
+++ b/libgeda/src/g_rc.c
@@ -25,9 +25,6 @@
#ifdef HAVE_STRING_H
#include <string.h>
#endif
-#ifdef HAVE_DIRENT_H
-#include <dirent.h>
-#endif
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
diff --git a/libgeda/src/s_menu.c b/libgeda/src/s_menu.c
index 2021290..582849f 100644
--- a/libgeda/src/s_menu.c
+++ b/libgeda/src/s_menu.c
@@ -27,9 +27,6 @@
#ifdef HAVE_STRING_H
#include <string.h>
#endif
-#if defined(HAVE_DIRENT_H)
-#include <dirent.h>
-#endif
#include "libgeda_priv.h"
diff --git a/libgeda/src/s_slib.c b/libgeda/src/s_slib.c
index 7074803..ffbc99b 100644
--- a/libgeda/src/s_slib.c
+++ b/libgeda/src/s_slib.c
@@ -30,9 +30,7 @@
#ifdef HAVE_STRING_H
#include <string.h>
#endif
-#ifdef HAVE_DIRENT_H
#include <dirent.h>
-#endif
#include "libgeda_priv.h"
diff --git a/utils/gschlas/g_rc.c b/utils/gschlas/g_rc.c
index f733fb5..8c46ab6 100644
--- a/utils/gschlas/g_rc.c
+++ b/utils/gschlas/g_rc.c
@@ -30,9 +30,6 @@
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
-#ifdef HAVE_DIRENT_H
-#include <dirent.h>
-#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
commit cf772193f3042184e5ca624cc7b1e8daef6f4a53
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
build-sys: Improve HTML conversion rules.
We want to make sure the HTML version of the man pages is always
distributed, but make building/installing it optional (in case users
don't have a proper groff installed).
This can be achieved by making sure that Automake only tries to
install the HTML man pages if a working groff is available. In
addition, `make distcheck' is set up to behave as if groff is not
installed.
Unfortunately, this still isn't ideal, because users who build from a
source archive (with pre-built HTML) won't get HTML installed unless
they have a working groff.
In the long run, what needs to happen is to use a mechanism like
`missing' to handle rebuilding of HTML man pages -- or just drop HTML
man pages altogether.
diff --git a/Makefile.am b/Makefile.am
index dbfdbd3..8e112f4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,14 @@ ACLOCAL_AMFLAGS = -I m4
# We need to ensure that `make distcheck' *doesn't* find a git
# repository!
-DISTCHECK_CONFIGURE_FLAGS = GIT="/bin/sh -c '! :'" --disable-update-xdg-database
+#
+# We also should be able to successfully build & install without
+# groff.
+false=/bin/sh -c '! :'
+DISTCHECK_CONFIGURE_FLAGS = \
+ GIT="$(false)" \
+ GROFF="$(false)" \
+ --disable-update-xdg-database
BUILT_SOURCES = version.h
EXTRA_DIST = autogen.sh version.h version.h.in README.Cygwin
diff --git a/gnetlist/docs/Makefile.am b/gnetlist/docs/Makefile.am
index 9b71345..bc13eff 100644
--- a/gnetlist/docs/Makefile.am
+++ b/gnetlist/docs/Makefile.am
@@ -1,39 +1,37 @@
SUBDIRS = vams
-EXTRA_DIST = README.bom README.pcb README.verilog README.vhdl README.switcap \
- README.sysc README.eagle gnetlist.1 gnetlist.html logo.png \
+EXTRA_DIST = $(html_man_files) logo.png \
gnetlist-main.txt what-is-geda.html what-is-gnetlist.html \
gnetlist.dox
-BUILT_SOURCES = gnetlist.html
-
-man_MANS = gnetlist.1
-
docsreadmedir = $(docdir)/readmes
-docsreadme_DATA = README.bom README.pcb README.switcap README.verilog \
- README.vhdl README.sysc README.eagle
+dist_docsreadme_DATA = \
+ README.bom README.pcb README.switcap README.verilog \
+ README.vhdl README.sysc README.eagle
+
+dist_man_MANS = gnetlist.1
-docsmandir = $(docdir)/man
-docsman_DATA = gnetlist.html
+# Rules for converting man->html
+html_man_files = gnetlist.html
SUFFIXES = .1 .html
+if ENABLE_GROFF_HTML
+docsmandir=$(docdir)/man
+docsman_DATA=$(html_man_files)
.1.html:
- @echo "Creating html manpage (using groff)"
- @rm -rf $*.tmp
- @if test "x$(GROFF)" != xno; then \
- LC_NUMERIC=C $(GROFF) -man -T html $*.1 >$*.tmp;\
- mv -f $*.tmp $*.html ;\
- else \
- echo "** Did not find groff **" ;\
- echo "Some Documentation might not be correct!" ;\
- touch $*.html ;\
- fi
-
-gnetlist.html: gnetlist.1
+ rm -rf $@.tmp && \
+ LC_NUMERIC=C $(GROFF) -man -T html $< >$@.tmp && \
+ mv -f $@.tmp $@
+else
+.1.html:
+ @echo "No working groff available: cannot create $@"
+ @! :
+endif
+
MOSTLYCLEANFILES = *.log *~
-CLEANFILES = *.log *~ gnetlist.html
+CLEANFILES = *.log *~
DISTCLEANFILES = *.log core FILE *~
-MAINTAINERCLEANFILES = *.log *~ Makefile.in gnetlist.html
+MAINTAINERCLEANFILES = *.log *~ Makefile.in $(html_man_files)
diff --git a/gschem/docs/Makefile.am b/gschem/docs/Makefile.am
index 6869b31..ffba327 100644
--- a/gschem/docs/Makefile.am
+++ b/gschem/docs/Makefile.am
@@ -1,7 +1,5 @@
-man_MANS = gschem.1
-
-EXTRA_DIST = gschem-main.txt what-is-geda.html what-is-gschem.html\
- gschem.1 logo.png gschem.dox
+EXTRA_DIST = $(html_man_files) gschem-main.txt what-is-geda.html \
+ what-is-gschem.html logo.png gschem.dox
all:
@echo 'Type: make doxygen to create doxygen documentation for gschem'
@@ -17,12 +15,33 @@ else
@echo 'The documentation can not be built from the sources.' >> $@
endif
+dist_man_MANS = gschem.1
+
+
+# Rules for converting man->html
+html_man_files = gschem.html
+SUFFIXES = .1 .html
+
+if ENABLE_GROFF_HTML
+docsmandir=$(docdir)/man
+docsman_DATA=$(html_man_files)
+.1.html:
+ rm -rf $@.tmp && \
+ LC_NUMERIC=C $(GROFF) -man -T html $< >$@.tmp && \
+ mv -f $@.tmp $@
+else
+.1.html:
+ @echo "No working groff available: cannot create $@"
+ @! :
+endif
+
+
MOSTLYCLEANFILES = *.log *~
CLEANFILES = *.log *~
DISTCLEANFILES = *.log core FILE *~ \
*.dvi *.info *.info-* *.aux *.fn \
*.fns *.cp *.ky *.pg *.toc *.tp *.vrs *.vr
-MAINTAINERCLEANFILES = *.log *~ Makefile.in
+MAINTAINERCLEANFILES = *.log *~ Makefile.in $(html_man_files)
distclean-local:
-rm -rf html latex
diff --git a/gsymcheck/docs/Makefile.am b/gsymcheck/docs/Makefile.am
index 366b828..e3edaa1 100644
--- a/gsymcheck/docs/Makefile.am
+++ b/gsymcheck/docs/Makefile.am
@@ -1,24 +1,30 @@
-EXTRA_DIST = gsymcheck.1 gsymcheck.html gsymcheck.dox logo.png \
+EXTRA_DIST = $(html_man_files) gsymcheck.dox logo.png \
gsymcheck-main.txt what-is-geda.html what-is-gsymcheck.html
-BUILT_SOURCES = gsymcheck.html
+dist_man_MANS = gsymcheck.1
-man_MANS = gsymcheck.1
-docsmandir = $(docdir)/man
-docsman_DATA = gsymcheck.html
+# Rules for converting man->html
+html_man_files = gsymcheck.html
+SUFFIXES = .1 .html
-.1.html:
if ENABLE_GROFF_HTML
- LC_NUMERIC=C $(GROFF) -man -T html $< > $@.tmp \
- && mv -f $@.tmp $@
+docsmandir=$(docdir)/man
+docsman_DATA=$(html_man_files)
+.1.html:
+ rm -rf $@.tmp && \
+ LC_NUMERIC=C $(GROFF) -man -T html $< >$@.tmp && \
+ mv -f $@.tmp $@
else
- echo "Cannot build $@ from $<: groff is missing."
+.1.html:
+ @echo "No working groff available: cannot create $@"
+ @! :
endif
+
MOSTLYCLEANFILES = *.log *~
CLEANFILES = *.log *~ gsymcheck.html
DISTCLEANFILES = *.log core FILE *~
-MAINTAINERCLEANFILES = *.log *~ Makefile.in gsymcheck.html
+MAINTAINERCLEANFILES = *.log *~ Makefile.in $(html_man_files)
diff --git a/utils/man/Makefile.am b/utils/man/Makefile.am
index 73abce2..47f7833 100644
--- a/utils/man/Makefile.am
+++ b/utils/man/Makefile.am
@@ -1,8 +1,26 @@
## Process this file with automake to produce Makefile.in
+dist_man_MANS = grenum.1
-man_MANS = grenum.1
-EXTRA_DIST = $(man_MANS)
+# Rules for converting man->html
+html_man_files = grenum.html
+SUFFIXES = .1 .html
-MAINTAINERCLEANFILES = Makefile.in
+if ENABLE_GROFF_HTML
+docsmandir=$(docdir)/man
+docsman_DATA=$(html_man_files)
+.1.html:
+ rm -rf $@.tmp && \
+ LC_NUMERIC=C $(GROFF) -man -T html $< >$@.tmp && \
+ mv -f $@.tmp $@
+else
+.1.html:
+ @echo "No working groff available: cannot create $@"
+ @! :
+endif
+
+
+EXTRA_DIST = $(html_man_files)
+
+MAINTAINERCLEANFILES = Makefile.in $(html_man_files)
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs