From b9125e4256e21938fa63324c3fb371f046597898 Mon Sep 17 00:00:00 2001 From: Ben Finney Date: Wed, 2 Mar 2016 10:38:30 +1100 Subject: [PATCH 01/14] Document myself as a contributor. --- AUTHORS.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/AUTHORS.md b/AUTHORS.md index b286e7ca3..f72b5740f 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -17,6 +17,10 @@ * Several others made smaller contributions, which GitHub tracks here:
https://github.com/zerotier/ZeroTierOne/graphs/contributors + * Documentation additions. + + Ben Finney + ## Third Party Code * LZ4 compression algorithm by Yann Collet (BSD license)
From fdb8ea93efadd9e4707bb6004bfcd25d3eead817 Mon Sep 17 00:00:00 2001 From: Ben Finney Date: Wed, 2 Mar 2016 10:56:23 +1100 Subject: [PATCH 02/14] =?UTF-8?q?Add=20a=20reStructuredText=20document=20f?= =?UTF-8?q?or=20a=20=E2=80=98zerotier-one(8)=E2=80=99=20man=20page.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/zerotier-one.8.txt | 91 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 doc/zerotier-one.8.txt diff --git a/doc/zerotier-one.8.txt b/doc/zerotier-one.8.txt new file mode 100644 index 000000000..8ad8d4937 --- /dev/null +++ b/doc/zerotier-one.8.txt @@ -0,0 +1,91 @@ +============ +zerotier-one +============ + +--------------------------------------------------- +end-point server for ZeroTier virtual network layer +--------------------------------------------------- + +:Author: |author| +:Date: 2016-03-04 +:Copyright: + Copyright © 2016 ZeroTier Inc. +:Manual section: 8 +:Manual group: ZeroTier + +.. |command| replace:: **zerotier-one** +.. |license| replace:: + `GNU General Public License, version 3 or later + `__ + + +SYNOPSIS +======== + +| |command| [ `option` ... ] [ `HOMEDIR` ] +| |command| **-h** +| |command| **-v** + + +DESCRIPTION +=========== + +**ZeroTier One** is the end-point server for the ZeroTier +software-defined network layer. + + +OPTIONS +======= + +**-h** + Display concise help on command usage. + +**-v** + Display program version. + +**-U** + Run as unprivileged user (skip privilege check). + +**-p** `PORT` + Communicate on network port `PORT` (either TCP or UDP). + +**-d** + Become a conventional daemon process. Only available on Unix-like + operating systems. + +**-i** + Generate and manage identities. + + This is equivalent to running the **zerotier-idtool** command. + +**-q** + Query the running ZeroTier One process. + + This is equivalent to running the **zerotier-cli** command. + + +HISTORY +======= + +The |command| program is developed by ZeroTier Inc. + +This manual page was written by |author|. This is free software: you +may copy, modify and/or distribute this work under the terms of the +|license| as published by the Free Software Foundation. No warranty +expressed or implied. + +.. |author| replace:: |authorname| |authoremail| +.. |authorname| replace:: Ben Finney +.. |authoremail| replace:: + + +.. + Local variables: + mode: rst + coding: utf-8 + time-stamp-format: "%:y-%02m-%02d" + time-stamp-start: "^:Date:[ ]+" + time-stamp-end: "$" + time-stamp-line-limit: 20 + End: + vim: filetype=rst fileencoding=utf-8 : From cee09b0d2efc6e2c25d560eebfe8c7aa4ea3d18c Mon Sep 17 00:00:00 2001 From: Ben Finney Date: Fri, 4 Mar 2016 11:36:04 +1100 Subject: [PATCH 03/14] Refine description of ZeroTier One. --- doc/zerotier-one.8.txt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/doc/zerotier-one.8.txt b/doc/zerotier-one.8.txt index 8ad8d4937..4692fa711 100644 --- a/doc/zerotier-one.8.txt +++ b/doc/zerotier-one.8.txt @@ -2,9 +2,9 @@ zerotier-one ============ ---------------------------------------------------- -end-point server for ZeroTier virtual network layer ---------------------------------------------------- +------------------------------------------------- +end-point peer for ZeroTier virtual network layer +------------------------------------------------- :Author: |author| :Date: 2016-03-04 @@ -30,9 +30,14 @@ SYNOPSIS DESCRIPTION =========== -**ZeroTier One** is the end-point server for the ZeroTier +**ZeroTier One** is the end-point peer for the ZeroTier software-defined network layer. +*ZeroTier* is a peer-to-peer virtual network. Its “virtual layer 1” +(VL1) is implemented in the communication between ZeroTier One peers. +This provides the OSI layer 1 functionality on which to build further +network services. + OPTIONS ======= From 71c84aee601247b08b189ffea8d86d92dafe8fc1 Mon Sep 17 00:00:00 2001 From: Ben Finney Date: Fri, 4 Mar 2016 11:36:19 +1100 Subject: [PATCH 04/14] =?UTF-8?q?Add=20=E2=80=9Csee=20also=E2=80=9D=20sect?= =?UTF-8?q?ion=20referring=20to=20ZeroTier=20documentation=20online.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/zerotier-one.8.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/doc/zerotier-one.8.txt b/doc/zerotier-one.8.txt index 4692fa711..8c81f41f4 100644 --- a/doc/zerotier-one.8.txt +++ b/doc/zerotier-one.8.txt @@ -69,6 +69,16 @@ OPTIONS This is equivalent to running the **zerotier-cli** command. +SEE ALSO +======== + +* ZeroTier One documentation: + + * Product page ``__. + * Configuration guide ``__. + * Technical FAQ ``__. + + HISTORY ======= From 09c61d5cb1b6cc571e897b29db14fbe0544fb6d3 Mon Sep 17 00:00:00 2001 From: Ben Finney Date: Fri, 4 Mar 2016 14:53:50 +1100 Subject: [PATCH 05/14] =?UTF-8?q?More=20explicit=20specification=20of=20ho?= =?UTF-8?q?w=20to=20use=20=E2=80=98-i=E2=80=99=20and=20=E2=80=98-q?= =?UTF-8?q?=E2=80=99.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/zerotier-one.8.txt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/doc/zerotier-one.8.txt b/doc/zerotier-one.8.txt index 8c81f41f4..1fbc4e2eb 100644 --- a/doc/zerotier-one.8.txt +++ b/doc/zerotier-one.8.txt @@ -23,6 +23,8 @@ SYNOPSIS ======== | |command| [ `option` ... ] [ `HOMEDIR` ] +| |command| **-i** [ `IDTOOL_ARG` ... ] +| |command| **-q** [ `QUERY_ARG` ... ] | |command| **-h** | |command| **-v** @@ -58,15 +60,17 @@ OPTIONS Become a conventional daemon process. Only available on Unix-like operating systems. -**-i** +**-i** [ `IDTOOL_ARG` ... ] Generate and manage identities. - This is equivalent to running the **zerotier-idtool** command. + This is equivalent to running the **zerotier-idtool** command with + all the specified `IDTOOL_ARG` parameters. -**-q** +**-q** [ `QUERY_ARG` ... ] Query the running ZeroTier One process. - This is equivalent to running the **zerotier-cli** command. + This is equivalent to running the **zerotier-cli** command with + all the specified `QUERY_ARG` parameters. SEE ALSO From 83bc5d95aabb5c672c9c9118769538fab3ee4712 Mon Sep 17 00:00:00 2001 From: Ben Finney Date: Fri, 4 Mar 2016 14:57:10 +1100 Subject: [PATCH 06/14] Document remaining options explicitly. --- doc/zerotier-one.8.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/zerotier-one.8.txt b/doc/zerotier-one.8.txt index 1fbc4e2eb..d5c8011d3 100644 --- a/doc/zerotier-one.8.txt +++ b/doc/zerotier-one.8.txt @@ -22,7 +22,7 @@ end-point peer for ZeroTier virtual network layer SYNOPSIS ======== -| |command| [ `option` ... ] [ `HOMEDIR` ] +| |command| [ **-U** ] [ **-p** `PORT` ] [ **-d** ] [ `HOMEDIR` ] | |command| **-i** [ `IDTOOL_ARG` ... ] | |command| **-q** [ `QUERY_ARG` ... ] | |command| **-h** From 88dfa860f4bd06b3e2e173d10bb9b87ab105a36a Mon Sep 17 00:00:00 2001 From: Ben Finney Date: Fri, 4 Mar 2016 15:08:17 +1100 Subject: [PATCH 07/14] Document how the home directory is used, and its default value. --- doc/zerotier-one.8.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc/zerotier-one.8.txt b/doc/zerotier-one.8.txt index d5c8011d3..b5e116241 100644 --- a/doc/zerotier-one.8.txt +++ b/doc/zerotier-one.8.txt @@ -73,6 +73,13 @@ OPTIONS all the specified `QUERY_ARG` parameters. +FILES +===== + +The |command| process will store its state in files within the +specified `HOMEDIR` directory (default: ``/var/lib/zerotier-one``). + + SEE ALSO ======== From a84a256df47c21a80524ac9667cc4077f0b7f049 Mon Sep 17 00:00:00 2001 From: Ben Finney Date: Fri, 4 Mar 2016 15:40:08 +1100 Subject: [PATCH 08/14] =?UTF-8?q?Add=20incomplete=20man=20pages=20for=20?= =?UTF-8?q?=E2=80=98zerotier-idtool=E2=80=99=20and=20=E2=80=98zerotier-cli?= =?UTF-8?q?=E2=80=99.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/zerotier-cli.1.txt | 109 ++++++++++++++++++++++++++++++++++++ doc/zerotier-idtool.1.txt | 115 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 224 insertions(+) create mode 100644 doc/zerotier-cli.1.txt create mode 100644 doc/zerotier-idtool.1.txt diff --git a/doc/zerotier-cli.1.txt b/doc/zerotier-cli.1.txt new file mode 100644 index 000000000..ae8a4af77 --- /dev/null +++ b/doc/zerotier-cli.1.txt @@ -0,0 +1,109 @@ +============ +zerotier-cli +============ + +-------------------------------------------------- +management interface for ZeroTier One peer process +-------------------------------------------------- + +:Author: |author| +:Date: 2016-03-04 +:Copyright: + Copyright © 2016 ZeroTier Inc. +:Manual section: 1 +:Manual group: ZeroTier + +.. |command| replace:: **zerotier-cli** +.. |license| replace:: + `GNU General Public License, version 3 or later + `__ + + +SYNOPSIS +======== + +| |command| [ **-j** ] [ **-D** `HOMEDIR` ] [ **-p** `PORT` ] [ **-t** `AUTH_TOKEN` ] \ + `command` [ `COMMAND_ARG` ] + + +DESCRIPTION +=========== + +|command| is a tool to manage the running **zerotier-one**\ (8) +process. + +*ZeroTier* is a peer-to-peer virtual network. Its “virtual layer 1” +(VL1) is implemented in the communication between ZeroTier One peers. +This provides the OSI layer 1 functionality on which to build further +network services. + + +COMMANDS +======== + +|command| **info** + + *FIXME*: display status info + +|command| **listpeers** + + *FIXME*: list all peers + +|command| **listnetworks** + + *FIXME*: list all networks + +|command| **join** `NETWORK` + + *FIXME*: join the network `NETWORK` + +|command| **leave** `NETWORK` + + *FIXME*: leave the network `NETWORK` + + +FILES +===== + +The |command| process will discover the running **zerotier-one**\ (8) +process by examining the specified `HOMEDIR` directory (default: +``/var/lib/zerotier-one``). + + +SEE ALSO +======== + +* **zerotier-one**\ (8) + +* ZeroTier One documentation: + + * Product page ``__. + * Configuration guide ``__. + * Technical FAQ ``__. + + +HISTORY +======= + +The |command| program is developed by ZeroTier Inc. + +This manual page was written by |author|. This is free software: you +may copy, modify and/or distribute this work under the terms of the +|license| as published by the Free Software Foundation. No warranty +expressed or implied. + +.. |author| replace:: |authorname| |authoremail| +.. |authorname| replace:: Ben Finney +.. |authoremail| replace:: + + +.. + Local variables: + mode: rst + coding: utf-8 + time-stamp-format: "%:y-%02m-%02d" + time-stamp-start: "^:Date:[ ]+" + time-stamp-end: "$" + time-stamp-line-limit: 20 + End: + vim: filetype=rst fileencoding=utf-8 : diff --git a/doc/zerotier-idtool.1.txt b/doc/zerotier-idtool.1.txt new file mode 100644 index 000000000..2ff0e4c1c --- /dev/null +++ b/doc/zerotier-idtool.1.txt @@ -0,0 +1,115 @@ +=============== +zerotier-idtool +=============== + +---------------------------------------------- +identity management tool for ZeroTier One peer +---------------------------------------------- + +:Author: |author| +:Date: 2016-03-04 +:Copyright: + Copyright © 2016 ZeroTier Inc. +:Manual section: 1 +:Manual group: ZeroTier + +.. |command| replace:: **zerotier-idtool** +.. |license| replace:: + `GNU General Public License, version 3 or later + `__ + + +SYNOPSIS +======== + +| |command| **generate** [ `SECRET` ] [ `PUBLIC` ] +| |command| **validate** `SECRET` +| |command| **getpublic** `SECRET` +| |command| **sign** `SECRET` +| |command| **verify** `IDENTITY` `FILE` `SIGNATURE` +| |command| **mkcom** `SECRET` `ID`\ **,**\ `VALUE`\ **,**\ `MAX_DELTA` [ ... ] `IDENTITY` + + +DESCRIPTION +=========== + +|command| is a tool to manage identities for the **zerotier-one**\ (8) +program. + +*ZeroTier* is a peer-to-peer virtual network. Its “virtual layer 1” +(VL1) is implemented in the communication between ZeroTier One peers. +This provides the OSI layer 1 functionality on which to build further +network services. + + +COMMANDS +======== + +|command| **generate** [ `SECRET` ] [ `PUBLIC` ] + + *FIXME*: generate an identity + +|command| **validate** `SECRET` + + *FIXME*: validate a secret identity + +|command| **getpublic** `SECRET` + + *FIXME*: get a public identity + +|command| **sign** `SECRET` + + *FIXME*: sign a secret identity + +|command| **verify** `IDENTITY` `FILE` `SIGNATURE` + + *FIXME*: verify a signature + +|command| **mkcom** `SECRET` `ID`\ **,**\ `VALUE`\ **,**\ `MAX_DELTA` [ ... ] `IDENTITY` + + *FIXME*: mkcom + + +FILES +===== + +*FIXME*: how does the process know its home directory? + + +SEE ALSO +======== + +* **zerotier-one**\ (8) + +* ZeroTier One documentation: + + * Product page ``__. + * Configuration guide ``__. + * Technical FAQ ``__. + + +HISTORY +======= + +The |command| program is developed by ZeroTier Inc. + +This manual page was written by |author|. This is free software: you +may copy, modify and/or distribute this work under the terms of the +|license| as published by the Free Software Foundation. No warranty +expressed or implied. + +.. |author| replace:: |authorname| |authoremail| +.. |authorname| replace:: Ben Finney +.. |authoremail| replace:: + + +.. + Local variables: + mode: rst + coding: utf-8 + time-stamp-format: "%:y-%02m-%02d" + time-stamp-start: "^:Date:[ ]+" + time-stamp-end: "$" + time-stamp-line-limit: 20 + End: + vim: filetype=rst fileencoding=utf-8 : From c63de2763316a4faa52325cd14c9934e6fb2f791 Mon Sep 17 00:00:00 2001 From: Ben Finney Date: Fri, 4 Mar 2016 15:41:06 +1100 Subject: [PATCH 09/14] =?UTF-8?q?Add=20references=20to=20other=20tools=20f?= =?UTF-8?q?or=20=E2=80=98zerotier-one=E2=80=99.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/zerotier-one.8.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/zerotier-one.8.txt b/doc/zerotier-one.8.txt index b5e116241..e730130e3 100644 --- a/doc/zerotier-one.8.txt +++ b/doc/zerotier-one.8.txt @@ -83,6 +83,8 @@ specified `HOMEDIR` directory (default: ``/var/lib/zerotier-one``). SEE ALSO ======== +* **zerotier-idtool**\ (1), **zerotier-cli**\ (1) + * ZeroTier One documentation: * Product page ``__. From 24e286b5ec38f1f836f11b5914564b4c9c0fc937 Mon Sep 17 00:00:00 2001 From: Ben Finney Date: Fri, 4 Mar 2016 16:04:57 +1100 Subject: [PATCH 10/14] Add a stub for an encoding declaration on a man page. --- doc/manpage_encoding_declaration.UTF-8 | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/manpage_encoding_declaration.UTF-8 diff --git a/doc/manpage_encoding_declaration.UTF-8 b/doc/manpage_encoding_declaration.UTF-8 new file mode 100644 index 000000000..991db0a6a --- /dev/null +++ b/doc/manpage_encoding_declaration.UTF-8 @@ -0,0 +1 @@ +'\" -*- coding: utf-8 -*- From 5993b178c559838e5963d87ba5cc4aa0dcdef2fa Mon Sep 17 00:00:00 2001 From: Ben Finney Date: Fri, 4 Mar 2016 16:05:55 +1100 Subject: [PATCH 11/14] Ignore generated man page files. --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 3b018c424..9c87a061e 100755 --- a/.gitignore +++ b/.gitignore @@ -79,3 +79,5 @@ java/build_win32/ windows/WinUI/obj/ windows/WinUI/bin/ windows/ZeroTierOne/Debug/ +/doc/*.1 +/doc/*.8 From cafc46a8e92abcd4efb6399c42ee975140cc4b4a Mon Sep 17 00:00:00 2001 From: Ben Finney Date: Fri, 4 Mar 2016 16:06:17 +1100 Subject: [PATCH 12/14] Add Makefile module for building documentation. --- doc/module.mk | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ make-linux.mk | 7 +++++++ 2 files changed, 55 insertions(+) create mode 100644 doc/module.mk diff --git a/doc/module.mk b/doc/module.mk new file mode 100644 index 000000000..581d06c08 --- /dev/null +++ b/doc/module.mk @@ -0,0 +1,48 @@ +# doc/module.mk +# Part of ZeroTier One, a software-defined network layer. +# +# Copyright © 2016 Ben Finney +# This is free software: you may copy, modify, and/or distribute this +# work under the terms of the GNU General Public License, version 3 or +# later as published by the Free Software Foundation. +# No warranty expressed or implied. +# See the file ‘LICENSE.txt’ for details. + +# Makefile module for ZeroTier One documentation. + +TEMPFILE_SUFFIX = .tmp +.INTERMEDIATE: ${DOCUMENTATION_DIR}/*${TEMPFILE_SUFFIX} + +RST_SUFFIX = .txt +manpage_sections = 1 2 3 4 5 6 7 8 +manpage_names += zerotier-one.8 +manpage_names += zerotier-idtool.1 +manpage_names += zerotier-cli.1 +manpage_source_paths = $(addprefix ${DOC_DIR}/, \ + $(addsuffix ${RST_SUFFIX},${manpage_names})) +manpage_paths = $(addprefix ${DOC_DIR}/,${manpage_names}) +manpage_encoding_stub = ${DOC_DIR}/manpage_encoding_declaration.UTF-8 + +GENERATED_FILES += $(addprefix ${DOC_DIR}/,\ + $(foreach section,${manpage_sections},*.${section})) + +RST2MAN = rst2man +RST2MAN_OPTS = + +.PHONY: manpages +manpages: ${manpage_paths} + +%.1: %.1${RST_SUFFIX} + $(RST2MAN) "$<" > "$@"${TEMPFILE_SUFFIX} + cat ${manpage_encoding_stub} "$@"${TEMPFILE_SUFFIX} > "$@" + +%.8: %.8${RST_SUFFIX} + $(RST2MAN) "$<" > "$@"${TEMPFILE_SUFFIX} + cat ${manpage_encoding_stub} "$@"${TEMPFILE_SUFFIX} > "$@" + + +# Local variables: +# coding: utf-8 +# mode: makefile +# End: +# vim: fileencoding=utf-8 filetype=make : diff --git a/make-linux.mk b/make-linux.mk index 3704c4acd..bb621359e 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 From 92702615a7d6067016df0369d1ed97f0afaa8966 Mon Sep 17 00:00:00 2001 From: Ben Finney Date: Fri, 4 Mar 2016 17:01:14 +1100 Subject: [PATCH 13/14] =?UTF-8?q?Add=20an=20overall=20=E2=80=9Cdoc?= =?UTF-8?q?=E2=80=9D=20build=20target.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/module.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/module.mk b/doc/module.mk index 581d06c08..34fdbaebf 100644 --- a/doc/module.mk +++ b/doc/module.mk @@ -29,6 +29,10 @@ GENERATED_FILES += $(addprefix ${DOC_DIR}/,\ RST2MAN = rst2man RST2MAN_OPTS = + +.PHONY: doc +doc: manpages + .PHONY: manpages manpages: ${manpage_paths} From c0262d8f76f0796671b16eac606e70bcb16da12c Mon Sep 17 00:00:00 2001 From: Ben Finney Date: Fri, 4 Mar 2016 17:01:31 +1100 Subject: [PATCH 14/14] =?UTF-8?q?Add=20=E2=80=9Cdoc=E2=80=9D=20to=20the=20?= =?UTF-8?q?dependencies=20for=20the=20=E2=80=9Call=E2=80=9D=20build=20targ?= =?UTF-8?q?et.?= 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(-) diff --git a/make-linux.mk b/make-linux.mk index bb621359e..4011db95e 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)