diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-06-02 13:58:34 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-06-02 13:58:34 -0700 |
| commit | 5bce3e37eeb65e85f97c9361a8f290e5ff5170cf (patch) | |
| tree | c9d6edd0e1c1c859e82bcbca72c5ab1fbd65a6bd | |
| parent | 6671d5553b9039f1ae21d101f3a3a51b5982e8c5 (diff) | |
| download | infinitytier-5bce3e37eeb65e85f97c9361a8f290e5ff5170cf.tar.gz infinitytier-5bce3e37eeb65e85f97c9361a8f290e5ff5170cf.zip | |
clean doc node_modules on clean
| -rw-r--r-- | make-linux.mk | 8 | ||||
| -rw-r--r-- | make-mac.mk | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/make-linux.mk b/make-linux.mk index 7744202e..cec0c4d4 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -18,9 +18,6 @@ # 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) @@ -144,7 +141,7 @@ selftest: $(OBJS) selftest.o # ./ext/installfiles/linux/buildinstaller.sh clean: FORCE - 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 + 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 doc/node_modules 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 @@ -158,7 +155,4 @@ debug: FORCE # make ZT_OFFICIAL_RELEASE=1 installer # make ZT_OFFICIAL_RELEASE=1 doc -# Includes 'doc' target -include ${DOC_DIR}/module.mk - FORCE: diff --git a/make-mac.mk b/make-mac.mk index 96da7146..8366e8f1 100644 --- a/make-mac.mk +++ b/make-mac.mk @@ -109,7 +109,7 @@ official: FORCE make ZT_OFFICIAL_RELEASE=1 mac-dist-pkg clean: - rm -rf netcon/*.so *.dSYM build-* *.pkg *.dmg *.o node/*.o controller/*.o service/*.o osdep/*.o ext/http-parser/*.o ext/lz4/*.o ext/json-parser/*.o $(OBJS) zerotier-one zerotier-idtool zerotier-selftest zerotier-cli ZeroTierOneInstaller-* mkworld + rm -rf netcon/*.so *.dSYM build-* *.pkg *.dmg *.o node/*.o controller/*.o service/*.o osdep/*.o ext/http-parser/*.o ext/lz4/*.o ext/json-parser/*.o $(OBJS) zerotier-one zerotier-idtool zerotier-selftest zerotier-cli ZeroTierOneInstaller-* mkworld doc/node_modules # For those building from source -- installs signed binary tap driver in system ZT home install-mac-tap: FORCE |