From d30db7b5c0a36fcf944ed7babbd8fb11193a1fcd Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Mon, 11 Jul 2016 14:50:49 +0100 Subject: Makefile rules to build the rst into html --- .gitignore | 6 +++++- Makefile | 14 ++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 00f42a6..aece1fb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,6 @@ -build +/build +/CHANGELOG.html +/docs/olm.html /olm-*.tgz +/README.html +/tracing/README.html \ No newline at end of file diff --git a/Makefile b/Makefile index 2bfd2ab..1af9b6b 100644 --- a/Makefile +++ b/Makefile @@ -44,6 +44,10 @@ JS_PRE := $(wildcard javascript/*pre.js) JS_POST := javascript/olm_outbound_group_session.js \ javascript/olm_inbound_group_session.js \ javascript/olm_post.js +DOCS := tracing/README.html \ + docs/olm.html \ + README.html \ + CHANGELOG.html CPPFLAGS += -Iinclude -Ilib # we rely on , which was introduced in C99 @@ -143,7 +147,7 @@ $(JS_EXPORTED_FUNCTIONS): $(PUBLIC_HEADERS) perl -MJSON -ne '$$f{"_$$1"}=1 if /(olm_[^( ]*)\(/; END { @f=sort keys %f; print encode_json \@f }' $^ > $@.tmp mv $@.tmp $@ -all: test js lib debug +all: test js lib debug doc .PHONY: all install-debug: debug @@ -163,9 +167,12 @@ install: lib .PHONY: install clean:; - rm -rf $(BUILD_DIR) + rm -rf $(BUILD_DIR) $(DOCS) .PHONY: clean +doc: $(DOCS) +.PHONY: doc + ### rules for building objects $(BUILD_DIR)/release/%.o: %.c mkdir -p $(dir $@) @@ -219,6 +226,9 @@ $(BUILD_DIR)/fuzzers/debug_%: fuzzers/fuzz_%.c $(DEBUG_OBJECTS) $(BUILD_DIR)/fuzzers/debug_%: fuzzers/fuzz_%.cpp $(DEBUG_OBJECTS) $(LINK.cc) $< $(DEBUG_OBJECTS) $(LOADLIBES) $(LDLIBS) -o $@ +%.html: %.rst + rst2html $< $@ + ### dependencies -include $(RELEASE_OBJECTS:.o=.d) -- cgit v1.2.3