From cafc46a8e92abcd4efb6399c42ee975140cc4b4a Mon Sep 17 00:00:00 2001 From: Ben Finney Date: Fri, 4 Mar 2016 16:06:17 +1100 Subject: Add Makefile module for building documentation. --- make-linux.mk | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'make-linux.mk') diff --git a/make-linux.mk b/make-linux.mk index 3704c4ac..bb621359 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -17,6 +17,8 @@ # clean: removes all built files, objects, other trash # +GENERATED_FILES := + # Automagically pick clang or gcc, with preference for clang # This is only done if we have not overridden these with an environment or CLI variable ifeq ($(origin CC),default) @@ -115,6 +117,7 @@ installer: one FORCE ./ext/installfiles/linux/buildinstaller.sh clean: FORCE + $(RM) -r ${GENERATED_FILES} rm -rf *.so *.o netcon/*.a node/*.o controller/*.o osdep/*.o service/*.o ext/http-parser/*.o ext/lz4/*.o ext/json-parser/*.o $(OBJS) zerotier-one zerotier-idtool zerotier-cli zerotier-selftest zerotier-netcon-service build-* ZeroTierOneInstaller-* *.deb *.rpm .depend netcon/.depend # Remove files from all the funny places we put them for tests find netcon -type f \( -name '*.o' -o -name '*.so' -o -name '*.1.0' -o -name 'zerotier-one' -o -name 'zerotier-cli' -o -name 'zerotier-netcon-service' \) -delete @@ -129,3 +132,7 @@ official: FORCE make ZT_OFFICIAL_RELEASE=1 installer FORCE: + +DOC_DIR = doc + +include ${DOC_DIR}/module.mk -- cgit v1.2.3 From c0262d8f76f0796671b16eac606e70bcb16da12c Mon Sep 17 00:00:00 2001 From: Ben Finney Date: Fri, 4 Mar 2016 17:01:31 +1100 Subject: Add “doc” to the dependencies for the “all” build target. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- make-linux.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'make-linux.mk') diff --git a/make-linux.mk b/make-linux.mk index bb621359..4011db95 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -89,7 +89,7 @@ endif #LDFLAGS= #STRIP=echo -all: one +all: one doc one: $(OBJS) service/OneService.o one.o osdep/LinuxEthernetTap.o $(CXX) $(CXXFLAGS) $(LDFLAGS) -o zerotier-one $(OBJS) service/OneService.o one.o osdep/LinuxEthernetTap.o $(LDLIBS) -- cgit v1.2.3