diff --git a/Makefile b/Makefile index 4a093870..b96dfa0e 100644 --- a/Makefile +++ b/Makefile @@ -23,13 +23,9 @@ help: # doc/source is the root of the rst files; the ../.. components effectively # counter the cd doc/source to place the docs at the schemas root .PHONY: docs -docs: docs-schemas +docs: cd doc/source; sphinx-build -b html -d ../../${BUILD_DIR}/doctrees . ../../${BUILD_DIR}/html -#=> docs-schema -- generate rst files from avdl -docs-schemas: - make -C doc/source/schemas default - .PHONY: package package: mvn package @@ -38,10 +34,7 @@ package: .PHONY: clean cleaner cleanest clean: find . -regex '.*\(~\|\.bak\)' -print0 | xargs -0r /bin/rm -v - make -C doc/source/schemas $@ cleaner: clean - make -C doc/source/schemas $@ cleanest: cleaner find . -regex '.*\(\.orig\)' -print0 | xargs -0r /bin/rm -v rm -fr target - make -C doc/source/schemas $@ diff --git a/doc/source/schemas/Makefile b/doc/source/schemas/Makefile deleted file mode 100644 index 292ecb69..00000000 --- a/doc/source/schemas/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# proto-to-rst Makefile -# -# GA4GH schema docs are generated from proto comments. The process is -# coordinated by this Makefile in these steps: -# * All .proto files are converted to .json using the -# protoc json plugin `tools/sphinx/my-plugin.py`. -# * All .json files are converted to .rst using a python script in -# schemas/tools. - - -.PHONY: FORCE -.SUFFIXES: -.DELETE_ON_ERROR: - -CACHE_DIR:=${HOME}/.cache/ga4gh -JSON_DIR:=/tmp/ga4gh-${UID}/json -PROTO_BASE_DIR:=../../../src/main/proto -PROTO_DIR:=${PROTO_BASE_DIR}/ga4gh - -AVPR2REST_PATH:=../../../tools/sphinx/protodoc2rst.py -PROTOC_PLUGIN_PATH:=../../../tools/sphinx/protobuf-json-docs.py - -PROTO_BASENAMES:=$(subst ${PROTO_DIR}/,,$(wildcard ${PROTO_DIR}/*.proto)) -AVPR_BASENAMES:=${PROTO_BASENAMES:.proto=.proto.json} -RST_BASENAMES:=${PROTO_BASENAMES:.proto=.rst} - - -default: ${RST_BASENAMES} - -%.proto.json: ${PROTO_DIR}/%.proto - mkdir -p ${JSON_DIR} - protoc --proto_path ${PROTO_BASE_DIR} --plugin=protoc-gen-custom=${PROTOC_PLUGIN_PATH} --custom_out=${JSON_DIR} $< - -%.rst: %.proto.json - python ${AVPR2REST_PATH} ${JSON_DIR}/ga4gh/$< . - -.PHONY: clean cleaner cleanest -clean: - /bin/rm -f *~ -cleaner: clean - /bin/rm -f *.avpr -cleanest: cleaner - /bin/rm -f ${RST_BASENAMES} \ No newline at end of file