[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

gEDA-cvs: gaf.git: branch: master updated (1.6.0-20091004-20-g405aebd)



The branch, master has been updated
       via  405aebd1b3a3f15f11330f94955b429190e60166 (commit)
       via  858982a2a05ff3e128de3621f1d301ecd989f35c (commit)
       via  ea34de8e761f40b697fc4800375ab8c5ef642c60 (commit)
       via  1248c66c7973f8d3835f6107d3f1ed9c5c880b43 (commit)
       via  c112db1048279a82e123d7d8cdbc3fe98b0a2f55 (commit)
      from  ef86dc34509308a29c2acca9eca73d7953b49346 (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                |   11 +++++++++++
 gattrib/docs/Makefile.am   |    4 ++--
 gnetlist/docs/Makefile.am  |   14 ++++++++++++++
 gschem/docs/Makefile.am    |    4 ++--
 gsymcheck/docs/Makefile.am |   15 +++++++++++++++
 libgeda/docs/Makefile.am   |    4 ++--
 m4/geda-doxygen.m4         |    4 ++--
 utils/docs/Makefile.am     |   16 ++++++++++++++++
 8 files changed, 64 insertions(+), 8 deletions(-)


=================
 Commit Messages
=================

commit 405aebd1b3a3f15f11330f94955b429190e60166
Author: Gareth Edwards <gareth@xxxxxxxxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    Added doxygen target to top level Makefile template
    
    Added a doxygen target to the top level Makefile.am that calls
    the same target in the relevant tool subdirectories to produce all
    the doxygen documentation at once (if --enable-doxygen was
    passed in the configure options).

:100644 100644 d728ee6... cad558a... M	Makefile.am

commit 858982a2a05ff3e128de3621f1d301ecd989f35c
Author: Gareth Edwards <gareth@xxxxxxxxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    Changed message on failure to generate doxygen docs
    
    If --enable-doxygen was not a configure flag, change the error message
    on an attempt to build doxygen documentation to suggest the configure
    flag was the cause of the failure rather than the lack of a doxygen
    install itself.

:100644 100644 91f5fee... 61809ec... M	gattrib/docs/Makefile.am
:100644 100644 8f14150... 3b938ec... M	gnetlist/docs/Makefile.am
:100644 100644 ace8470... 8876e6e... M	gschem/docs/Makefile.am
:100644 100644 b6b0169... 0a38bcc... M	gsymcheck/docs/Makefile.am
:100644 100644 ce3fe71... b459e81... M	libgeda/docs/Makefile.am
:100644 100644 e0e3582... 5b8f338... M	utils/docs/Makefile.am

commit ea34de8e761f40b697fc4800375ab8c5ef642c60
Author: Gareth Edwards <gareth@xxxxxxxxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    Don't drop a file called "doxygen"
    
    Remove the file redirection that causes a file called "doxygen"
    to be created in the */docs/ directories if --enable-doxygen
    is *not* one of the configure flags.

:100644 100644 fabc342... 91f5fee... M	gattrib/docs/Makefile.am
:100644 100644 ffba327... ace8470... M	gschem/docs/Makefile.am
:100644 100644 c80a0ac... ce3fe71... M	libgeda/docs/Makefile.am

commit 1248c66c7973f8d3835f6107d3f1ed9c5c880b43
Author: Gareth Edwards <gareth@xxxxxxxxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    Added doxygen targets to remaining applications.

:100644 100644 bc13eff... 8f14150... M	gnetlist/docs/Makefile.am
:100644 100644 e3edaa1... b6b0169... M	gsymcheck/docs/Makefile.am
:100644 100644 f66b053... e0e3582... M	utils/docs/Makefile.am

commit c112db1048279a82e123d7d8cdbc3fe98b0a2f55
Author: Gareth Edwards <gareth@xxxxxxxxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    Improved help text and messaging for --enable-doxygen switch.
    
    As per Stefan Salewski's email of 10 Oct 2009, clarified the
    configure help text for the --enable-doxygen switch and the transcript
    message.

:100644 100644 9e4a1d4... f5a5116... M	m4/geda-doxygen.m4

=========
 Changes
=========

commit 405aebd1b3a3f15f11330f94955b429190e60166
Author: Gareth Edwards <gareth@xxxxxxxxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    Added doxygen target to top level Makefile template
    
    Added a doxygen target to the top level Makefile.am that calls
    the same target in the relevant tool subdirectories to produce all
    the doxygen documentation at once (if --enable-doxygen was
    passed in the configure options).

diff --git a/Makefile.am b/Makefile.am
index d728ee6..cad558a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,5 +59,16 @@ stamp-git:
 .PHONY: stamp-git
 endif HAVE_GIT_REPO
 
+doxygen:
+if ENABLE_DOXYGEN
+	@for subdir in gattrib/docs gschem/docs gnetlist/docs \
+	  libgeda/docs gsymcheck/docs utils/docs ; do \
+	  (cd $$subdir; $(MAKE) doxygen) || exit 1; \
+        done
+else
+	@echo 'configure was not run with the --enable-doxygen switch.'
+	@echo 'The documentation cannot be built from the sources.'
+endif
+
 DISTCLEANFILES = stamp-git
 MAINTAINERCLEANFILES=Makefile.in aclocal.m4 config.h.in configure

commit 858982a2a05ff3e128de3621f1d301ecd989f35c
Author: Gareth Edwards <gareth@xxxxxxxxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    Changed message on failure to generate doxygen docs
    
    If --enable-doxygen was not a configure flag, change the error message
    on an attempt to build doxygen documentation to suggest the configure
    flag was the cause of the failure rather than the lack of a doxygen
    install itself.

diff --git a/gattrib/docs/Makefile.am b/gattrib/docs/Makefile.am
index 91f5fee..61809ec 100644
--- a/gattrib/docs/Makefile.am
+++ b/gattrib/docs/Makefile.am
@@ -11,8 +11,8 @@ doxygen: gattrib.dox
 if ENABLE_DOXYGEN
 	$(DOXYGEN) gattrib.dox
 else
-	@echo 'Doxygen is not installed on your system.'
-	@echo 'The documentation can not be built from the sources.'
+	@echo 'configure was not run with the --enable-doxygen switch.'
+	@echo 'The documentation cannot be built from the sources.'
 endif
 
 MOSTLYCLEANFILES = 	*.log *~
diff --git a/gnetlist/docs/Makefile.am b/gnetlist/docs/Makefile.am
index 8f14150..3b938ec 100644
--- a/gnetlist/docs/Makefile.am
+++ b/gnetlist/docs/Makefile.am
@@ -35,8 +35,8 @@ doxygen: gnetlist.dox
 if ENABLE_DOXYGEN
 	$(DOXYGEN) gnetlist.dox
 else
-	@echo 'Doxygen is not installed on your system.'
-	@echo 'The documentation can not be built from the sources.'
+	@echo 'configure was not run with the --enable-doxygen switch.'
+	@echo 'The documentation cannot be built from the sources.'
 endif
 
 MOSTLYCLEANFILES = *.log *~
diff --git a/gschem/docs/Makefile.am b/gschem/docs/Makefile.am
index ace8470..8876e6e 100644
--- a/gschem/docs/Makefile.am
+++ b/gschem/docs/Makefile.am
@@ -11,8 +11,8 @@ if ENABLE_DOXYGEN
 	-cd latex && $(MAKE)
 	-cd ..
 else
-	@echo 'Doxygen is not installed on your system.'
-	@echo 'The documentation can not be built from the sources.'
+	@echo 'configure was not run with the --enable-doxygen switch.'
+	@echo 'The documentation cannot be built from the sources.'
 endif
 
 dist_man_MANS = gschem.1
diff --git a/gsymcheck/docs/Makefile.am b/gsymcheck/docs/Makefile.am
index b6b0169..0a38bcc 100644
--- a/gsymcheck/docs/Makefile.am
+++ b/gsymcheck/docs/Makefile.am
@@ -27,8 +27,8 @@ doxygen: gsymcheck.dox
 if ENABLE_DOXYGEN
 	$(DOXYGEN) gsymcheck.dox
 else
-	@echo 'Doxygen is not installed on your system.'
-	@echo 'The documentation can not be built from the sources.'
+	@echo 'configure was not run with the --enable-doxygen switch.'
+	@echo 'The documentation cannot be built from the sources.'
 endif
 
 
diff --git a/libgeda/docs/Makefile.am b/libgeda/docs/Makefile.am
index ce3fe71..b459e81 100644
--- a/libgeda/docs/Makefile.am
+++ b/libgeda/docs/Makefile.am
@@ -17,8 +17,8 @@ if ENABLE_DOXYGEN
 	-cd latex && $(MAKE)
 	-cd ..
 else
-	@echo 'Doxygen is not installed on your system.'
-	@echo 'The documentation can not be built from the sources.'
+	@echo 'configure was not run with the --enable-doxygen switch.'
+	@echo 'The documentation cannot be built from the sources.'
 endif
 
 MOSTLYCLEANFILES = 	*.log *~
diff --git a/utils/docs/Makefile.am b/utils/docs/Makefile.am
index e0e3582..5b8f338 100644
--- a/utils/docs/Makefile.am
+++ b/utils/docs/Makefile.am
@@ -11,8 +11,8 @@ doxygen: utils.dox
 if ENABLE_DOXYGEN
 	$(DOXYGEN) utils.dox
 else
-	@echo 'Doxygen is not installed on your system.'
-	@echo 'The documentation can not be built from the sources.'
+	@echo 'configure was not run with the --enable-doxygen switch.'
+	@echo 'The documentation cannot be built from the sources.'
 endif
 
 

commit ea34de8e761f40b697fc4800375ab8c5ef642c60
Author: Gareth Edwards <gareth@xxxxxxxxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    Don't drop a file called "doxygen"
    
    Remove the file redirection that causes a file called "doxygen"
    to be created in the */docs/ directories if --enable-doxygen
    is *not* one of the configure flags.

diff --git a/gattrib/docs/Makefile.am b/gattrib/docs/Makefile.am
index fabc342..91f5fee 100644
--- a/gattrib/docs/Makefile.am
+++ b/gattrib/docs/Makefile.am
@@ -11,8 +11,8 @@ doxygen: gattrib.dox
 if ENABLE_DOXYGEN
 	$(DOXYGEN) gattrib.dox
 else
-	@echo 'Doxygen is not installed on your system.' >> $@
-	@echo 'The documentation can not be built from the sources.'     >> $@
+	@echo 'Doxygen is not installed on your system.'
+	@echo 'The documentation can not be built from the sources.'
 endif
 
 MOSTLYCLEANFILES = 	*.log *~
diff --git a/gschem/docs/Makefile.am b/gschem/docs/Makefile.am
index ffba327..ace8470 100644
--- a/gschem/docs/Makefile.am
+++ b/gschem/docs/Makefile.am
@@ -11,8 +11,8 @@ if ENABLE_DOXYGEN
 	-cd latex && $(MAKE)
 	-cd ..
 else
-	@echo 'Doxygen is not installed on your system.' >> $@
-	@echo 'The documentation can not be built from the sources.' >> $@
+	@echo 'Doxygen is not installed on your system.'
+	@echo 'The documentation can not be built from the sources.'
 endif
 
 dist_man_MANS = gschem.1
diff --git a/libgeda/docs/Makefile.am b/libgeda/docs/Makefile.am
index c80a0ac..ce3fe71 100644
--- a/libgeda/docs/Makefile.am
+++ b/libgeda/docs/Makefile.am
@@ -17,8 +17,8 @@ if ENABLE_DOXYGEN
 	-cd latex && $(MAKE)
 	-cd ..
 else
-	@echo 'Doxygen is not installed on your system.' >> $@
-	@echo 'The documentation can not be built from the sources.'     >> $@
+	@echo 'Doxygen is not installed on your system.'
+	@echo 'The documentation can not be built from the sources.'
 endif
 
 MOSTLYCLEANFILES = 	*.log *~

commit 1248c66c7973f8d3835f6107d3f1ed9c5c880b43
Author: Gareth Edwards <gareth@xxxxxxxxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    Added doxygen targets to remaining applications.

diff --git a/gnetlist/docs/Makefile.am b/gnetlist/docs/Makefile.am
index bc13eff..8f14150 100644
--- a/gnetlist/docs/Makefile.am
+++ b/gnetlist/docs/Makefile.am
@@ -30,8 +30,22 @@ else
 	@! :
 endif
 
+doxygen: gnetlist.dox
+	@echo 'Creating doxygen documentation for gnetlist...'
+if ENABLE_DOXYGEN
+	$(DOXYGEN) gnetlist.dox
+else
+	@echo 'Doxygen is not installed on your system.'
+	@echo 'The documentation can not be built from the sources.'
+endif
 
 MOSTLYCLEANFILES = *.log *~
 CLEANFILES = *.log *~
 DISTCLEANFILES = *.log core FILE *~
 MAINTAINERCLEANFILES = *.log *~ Makefile.in $(html_man_files)
+
+distclean-local:
+	-rm -rf html latex
+
+maintainer-clean-local:
+	-rm -rf html latex
diff --git a/gsymcheck/docs/Makefile.am b/gsymcheck/docs/Makefile.am
index e3edaa1..b6b0169 100644
--- a/gsymcheck/docs/Makefile.am
+++ b/gsymcheck/docs/Makefile.am
@@ -22,9 +22,24 @@ else
 	@! :
 endif
 
+doxygen: gsymcheck.dox
+	@echo 'Creating doxygen documentation for gsymcheck...'
+if ENABLE_DOXYGEN
+	$(DOXYGEN) gsymcheck.dox
+else
+	@echo 'Doxygen is not installed on your system.'
+	@echo 'The documentation can not be built from the sources.'
+endif
+
+
 
 MOSTLYCLEANFILES = *.log *~
 CLEANFILES = *.log *~ gsymcheck.html
 DISTCLEANFILES = *.log core FILE *~
 MAINTAINERCLEANFILES = *.log *~ Makefile.in $(html_man_files)
 
+distclean-local:
+	-rm -rf html latex
+
+maintainer-clean-local:
+	-rm -rf html latex
diff --git a/utils/docs/Makefile.am b/utils/docs/Makefile.am
index f66b053..e0e3582 100644
--- a/utils/docs/Makefile.am
+++ b/utils/docs/Makefile.am
@@ -6,7 +6,23 @@ EXTRA_DIST = README.gsch2pcb README.olib README.tragesym README.grenum \
 docsreadmedir = $(docdir)/readmes
 docsreadme_DATA = README.gsch2pcb README.olib README.tragesym README.grenum
 
+doxygen: utils.dox
+	@echo 'Creating doxygen documentation for utils...'
+if ENABLE_DOXYGEN
+	$(DOXYGEN) utils.dox
+else
+	@echo 'Doxygen is not installed on your system.'
+	@echo 'The documentation can not be built from the sources.'
+endif
+
+
 MOSTLYCLEANFILES = *.log *~
 CLEANFILES = *.log *~ 
 DISTCLEANFILES = *.log core FILE *~
 MAINTAINERCLEANFILES = *.log *~ Makefile.in
+
+distclean-local:
+	-rm -rf html latex
+
+maintainer-clean-local:
+	-rm -rf html latex

commit c112db1048279a82e123d7d8cdbc3fe98b0a2f55
Author: Gareth Edwards <gareth@xxxxxxxxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    Improved help text and messaging for --enable-doxygen switch.
    
    As per Stefan Salewski's email of 10 Oct 2009, clarified the
    configure help text for the --enable-doxygen switch and the transcript
    message.

diff --git a/m4/geda-doxygen.m4 b/m4/geda-doxygen.m4
index 9e4a1d4..f5a5116 100644
--- a/m4/geda-doxygen.m4
+++ b/m4/geda-doxygen.m4
@@ -25,9 +25,9 @@ AC_DEFUN([AX_OPTION_DOXYGEN],
   AC_ARG_VAR([DOXYGEN], [Path to doxygen executable])
 
   # Check if the user enabled Doxygen
-  AC_MSG_CHECKING([whether to generate API documentation])
+  AC_MSG_CHECKING([whether to enable generation of Doxygen API documentation])
   AC_ARG_ENABLE([doxygen],
-    [AS_HELP_STRING([--enable-doxygen], [generate Doxygen API documentation])])
+    [AS_HELP_STRING([--enable-doxygen], [enable generation of Doxygen API documentation])])
 
   # If user enabled doxygen, find the path to the doxygen
   # executable. Also check for other required tools.




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs