From: Rafał Długołęcki <kontakt@dlugolecki.net.pl>
Date: Wed, 7 Aug 2013 07:07:32 +0000 (+0200)
Subject: Moved doxygen output from doc/doxygen to doc. Commented out manuals generation in... 
X-Git-Tag: 3.1
X-Git-Url: https://git.dlugolecki.net.pl/?a=commitdiff_plain;h=039be9ffe5d08081e18a9b98d00b899d14577f19;p=vlp.git

Moved doxygen output from doc/doxygen to doc. Commented out manuals generation in package.
---

diff --git a/Doxyfile.in b/Doxyfile.in
index a3a0547..2a71dd3 100644
--- a/Doxyfile.in
+++ b/Doxyfile.in
@@ -54,7 +54,7 @@ PROJECT_LOGO           = doc/install/inst/logo.bmp
 # If a relative path is entered, it will be relative to the location
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = doc/doxygen
+OUTPUT_DIRECTORY       = doc
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
 # 4096 sub-directories (in 2 levels) under the output directory of each output
diff --git a/Makefile.am b/Makefile.am
index 96d0cf9..902015e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -179,11 +179,13 @@ CLEANFILES = \
 
 if HAVE_DOXYGEN
 
-directory = $(top_srcdir)/doc/man/man3/
+directory = $(top_srcdir)/doc/man/man3
 
-dist_man_MANS = $(directory)/man_page_1.3 $(directory)/man_page_2.3
-$(directory)/man_page_1.3: doxyfile.stamp
-$(directory)/man_page_2.3: doxyfile.stamp
+#dist_man_MANS = \
+#	$(directory)/Editor.3 \
+#	$(directory)/QKernel.3
+#$(directory)/man_page_1.3: doxyfile.stamp
+#$(directory)/man_page_2.3: doxyfile.stamp
 
 doxyfile.stamp:
 	$(DOXYGEN) Doxyfile
diff --git a/doc/html/ansi.html b/doc/html-old/ansi.html
similarity index 100%
rename from doc/html/ansi.html
rename to doc/html-old/ansi.html
diff --git a/doc/html/gui.html b/doc/html-old/gui.html
similarity index 100%
rename from doc/html/gui.html
rename to doc/html-old/gui.html
diff --git a/doc/html/gui1.html b/doc/html-old/gui1.html
similarity index 100%
rename from doc/html/gui1.html
rename to doc/html-old/gui1.html
diff --git a/doc/html/gui2.html b/doc/html-old/gui2.html
similarity index 100%
rename from doc/html/gui2.html
rename to doc/html-old/gui2.html
diff --git a/doc/html/iiuwgraph.html b/doc/html-old/iiuwgraph.html
similarity index 100%
rename from doc/html/iiuwgraph.html
rename to doc/html-old/iiuwgraph.html
diff --git a/doc/html/index.html b/doc/html-old/index.html
similarity index 100%
rename from doc/html/index.html
rename to doc/html-old/index.html
diff --git a/doc/html/langg.html b/doc/html-old/langg.html
similarity index 100%
rename from doc/html/langg.html
rename to doc/html-old/langg.html
diff --git a/doc/html/machine.html b/doc/html-old/machine.html
similarity index 100%
rename from doc/html/machine.html
rename to doc/html-old/machine.html
diff --git a/doc/html/userg.html b/doc/html-old/userg.html
similarity index 100%
rename from doc/html/userg.html
rename to doc/html-old/userg.html