Merged changeset r9285:9377 from jblum/grc into trunk, with distcheck fixes

and local modifications.

Integrates previously separate GNU Radio Companion into top-level component
'grc'.  (Josh Blum)


git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9378 221aa14e-8319-0410-a670-987f0aec2ac5

2 files changed, 5 insertions, 18 deletions

diff --git a/gnuradio-core/doc/Doxyfile.in b/gnuradio-core/doc/Doxyfile.in
index c6d998f2a..d83e65d40 100644
--- a/gnuradio-core/doc/Doxyfile.in
+++ b/gnuradio-core/doc/Doxyfile.in
@@ -765,7 +765,7 @@ IGNORE_PREFIX          =
 # If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
 # generate HTML output.
 
-GENERATE_HTML          = YES
+GENERATE_HTML          = @enable_html_docs@
 
 # The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be 
@@ -885,7 +885,7 @@ TREEVIEW_WIDTH         = 250
 # If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
 # generate Latex output.
 
-GENERATE_LATEX         = NO
+GENERATE_LATEX         = @enable_latex_docs@
 
 # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be 
@@ -1032,7 +1032,7 @@ MAN_LINKS              = NO
 # generate an XML file that captures the structure of 
 # the code including all documentation.
 
-GENERATE_XML           = NO
+GENERATE_XML           = @enable_xml_docs@
 
 # The XML_OUTPUT tag is used to specify where the XML pages will be put. 
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be 
diff --git a/gnuradio-core/doc/Makefile.am b/gnuradio-core/doc/Makefile.am
index 4786b3759..a499946a1 100644
--- a/gnuradio-core/doc/Makefile.am
+++ b/gnuradio-core/doc/Makefile.am
@@ -23,7 +23,6 @@ include $(top_srcdir)/Makefile.common
 
 SUBDIRS = other xml
 
-man3dir = $(mandir)/man3
 docdir  = $(prefix)/share/doc/@PACKAGE@-@VERSION@
 
 EXTRA_DIST = 
@@ -38,20 +37,6 @@ html/index.html:
 prep:
 	mkdir -p html
 
-#install-data-local:
-#	$(mkinstalldirs) $(DESTDIR)$(man3dir)
-#	@for i in ./man/man3/*.3; do \
-#		inst=`basename $$i | sed 's/_/:/g'`; \
-#		echo "$(INSTALL_DATA) $$i $(DESTDIR)$(man3dir)/$$inst"; \
-#		$(INSTALL_DATA) $$i $(DESTDIR)$(man3dir)/$$inst; \
-#	done
-#	$(mkinstalldirs) $(DESTDIR)$(docdir)
-##	@for i in ../README ../ChangeLog @PACKAGE@.ps @PACKAGE@.pdf; do \
-##		echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)"; \
-##		$(INSTALL_DATA) $$i $(DESTDIR)$(docdir); \
-##	done
-#	cp -r html $(docdir)
-
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(docdir)
 	@for i in $(top_srcdir)/README $(top_srcdir)/README.hacking; do \
@@ -59,6 +44,7 @@ install-data-local:
 		$(INSTALL_DATA) $$i $(DESTDIR)$(docdir); \
 	done
 	cp -r html $(DESTDIR)$(docdir)
+	cp -r xml $(DESTDIR)$(docdir)
 
 uninstall-local:
 	@for i in README README.hacking; do \
@@ -66,6 +52,7 @@ uninstall-local:
 		$(RM) $(DESTDIR)$(docdir)/$$i; \
 	done
 	$(RM) -fr $(DESTDIR)$(docdir)/html
+	$(RM) -fr $(DESTDIR)$(docdir)/xml
 
 clean-local:
 	$(RM) -fr latex html man