diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-04-07 12:28:43 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-04-07 12:28:43 -0700 |
| commit | 9b8444fff104b9776c7dc3a4019375680a283fdc (patch) | |
| tree | ba2254fb081e2a7604f02f53721c575f7483a8f7 /make-linux.mk | |
| parent | 43e317f0b7745495e27d10521215a577e1630cd2 (diff) | |
| parent | c0262d8f76f0796671b16eac606e70bcb16da12c (diff) | |
| download | infinitytier-9b8444fff104b9776c7dc3a4019375680a283fdc.tar.gz infinitytier-9b8444fff104b9776c7dc3a4019375680a283fdc.zip | |
Merge of bignose/manual-pages (Linux man pages)
Diffstat (limited to 'make-linux.mk')
| -rw-r--r-- | make-linux.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/make-linux.mk b/make-linux.mk index b20cfdfd..0b59b5b0 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -17,6 +17,9 @@ # clean: removes all built files, objects, other trash # +GENERATED_FILES := +DOC_DIR = doc + # 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) @@ -87,7 +90,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) @@ -115,8 +118,7 @@ installer: one FORCE ./ext/installfiles/linux/buildinstaller.sh clean: FORCE - 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 ext/miniupnpc/*.o ext/libnatpmp/*.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 + rm -rf ${GENERATED_FILES} *.so *.o netcon/*.a node/*.o controller/*.o osdep/*.o service/*.o ext/http-parser/*.o ext/lz4/*.o ext/json-parser/*.o ext/miniupnpc/*.o ext/libnatpmp/*.o $(OBJS) zerotier-one zerotier-idtool zerotier-cli zerotier-selftest zerotier-netcon-service build-* ZeroTierOneInstaller-* *.deb *.rpm .depend netcon/.depend 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 find netcon/docker-test -name "zerotier-intercept" -type f -delete @@ -129,4 +131,6 @@ official: FORCE make -j 4 ZT_OFFICIAL_RELEASE=1 one make ZT_OFFICIAL_RELEASE=1 installer +include ${DOC_DIR}/module.mk + FORCE: |