doc: move dox generation from apiupload to apidoc

diff --git a/doc/Makefile b/doc/Makefile
index 424c281d615278e640cc5908c5e350e528d8ad36..a1d1fc31de055ea3f3646c35e0c2ec5becd5a881 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -76,16 +76,16 @@ apidoc:
        rm -rf api
        mkdir -p api
        cd ../python && $(EPYDOC) $(EPYARGS) -o ../doc/api $(PY_PKGS)
+       cd ../sql/pgq && rm -rf docs/html && $(MAKE) dox
+       cd ../sql/pgq_coop && rm -rf docs/html && $(MAKE) dox
+       cd ../sql/pgq_node && rm -rf docs/html && $(MAKE) dox
+       cd ../sql/londiste && rm -rf docs/html && $(MAKE) dox
 
 apiupload: apidoc
        rsync -rtlz api/* $(web)/api
-       cd ../sql/pgq && rm -rf docs/html && $(MAKE) dox
        rsync -rtlz ../sql/pgq/docs/html/* $(web)/pgq/
-       cd ../sql/pgq_coop && rm -rf docs/html && $(MAKE) dox
        rsync -rtlz ../sql/pgq_coop/docs/html/* $(web)/pgq_coop/
-       cd ../sql/pgq_node && rm -rf docs/html && $(MAKE) dox
        rsync -rtlz ../sql/pgq_node/docs/html/* $(web)/pgq_node/
-       cd ../sql/londiste && rm -rf docs/html && $(MAKE) dox
        rsync -rtlz ../sql/londiste/docs/html/* $(web)/londiste/
 
 clean: