Better build stuff

git-svn-id: svn+ssh://jackaudio.org/trunk/jack@456 0c269be4-1314-0410-8aa9-9f06e86f4224

doc/.cvsignore

@@ -2,5 +2,4 @@ Makefile
 Makefile.in
 doxygen-build.stamp
 reference.doxygen
-html
-latex
+reference

doc/Makefile.am

@@ -7,7 +7,7 @@ DOX=reference.doxygen
 
 EXTRA_DIST=mainpage.dox transport.dox fsm.png
 
-INSTIMAGES=html/doxygen.png html/fsm.png
+INSTIMAGES=reference/html/doxygen.png reference/html/fsm.png
 
 DOC_STAMPS=html-build.stamp
 
@@ -15,7 +15,8 @@ DOC_DIR=$(HTML_DIR)
 
 all-local: doxygen-build.stamp
 
-doxygen-build.stamp: $(DOX) 
+doxygen-build.stamp: $(DOX) mainpage.dox transport.dox fsm.png \
+../jack/jack.h ../jack/types.h ../jack/transport.h
 	@echo '*** Running doxygen ***'
 	doxygen $(DOX)
 	touch doxygen-build.stamp
@@ -27,36 +28,36 @@ clean-local:
 
 distclean-local: clean
 	rm -f *.stamp || true
-	if test -d html; then rm -rf html; fi
-	if test -d latex; then rm -rf latex; fi
+	if test -d reference; then rm -rf reference; fi
 
 install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(DOC_DIR)/html
-	(installfiles=`echo html/*.html`; \
-	if test "$$installfiles" = 'html/*.html'; \
+	$(mkinstalldirs) $(DESTDIR)$(DOC_DIR)/reference/html
+	(installfiles=`echo reference/html/*.html`; \
+	if test "$$installfiles" = 'reference/html/*.html'; \
 	then echo '-- Nothing to install' ; \
 	else \
-	  for i in $$installfiles $(INSTIMAGES) html/doxygen.css; do \
+	  for i in $$installfiles $(INSTIMAGES) reference/html/doxygen.css; do \
 	    echo '-- Installing '$$i ; \
-	    $(INSTALL_DATA) $$i $(DESTDIR)$(DOC_DIR)/html; \
+	    $(INSTALL_DATA) $$i $(DESTDIR)$(DOC_DIR)/reference/html; \
 	  done; \
 	fi)
 
 # we need doxygen stuff built so we can know what to uninstall
 uninstall-local: doxygen-build.stamp
-	(installfiles=`echo html/*.html`; \
-	if test "$$installfiles" = 'html/*.html'; \
+	(installfiles=`echo reference/html/*.html`; \
+	if test "$$installfiles" = 'reference/html/*.html'; \
 	then echo '-- Nothing to uninstall' ; \
 	else \
-	  for i in $$installfiles $(INSTIMAGES) html/doxygen.css; do \
+	  for i in $$installfiles $(INSTIMAGES) reference/html/doxygen.css; do \
 	    echo '-- Unstalling '$$i ; \
 	    rm $(DESTDIR)$(DOC_DIR)/$$i; \
 	  done; \
 	fi)
 
 dist-hook: dist-hook-local
-	mkdir $(distdir)/html
-	-cp html/*.html html/*.css \
-	    html/*.png  $(distdir)/html
+	mkdir $(distdir)/reference
+	mkdir $(distdir)/reference/html
+	-cp reference/html/*.html reference/html/*.css \
+	    reference/html/*.png  $(distdir)/reference/html
 
 .PHONY : dist-hook-local

doc/reference.doxygen.in

@@ -30,7 +30,7 @@ PROJECT_NUMBER         = @JACK_VERSION@
 # 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       = 
+OUTPUT_DIRECTORY       = reference
 
 # The OUTPUT_LANGUAGE tag is used to specify the language in which all 
 # documentation generated by doxygen is written. Doxygen will use this