diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-06-16 14:50:08 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-06-16 14:50:08 -0700 |
| commit | bc3d7d11fe13ce7b3a01b77e1002a78e53d99f83 (patch) | |
| tree | 9e4da34ae7e734efe85d036ec6c6ca1208d10746 /make-linux.mk | |
| parent | 490d20e8fb1c936324e3501196004592f46b3ff4 (diff) | |
| download | infinitytier-bc3d7d11fe13ce7b3a01b77e1002a78e53d99f83.tar.gz infinitytier-bc3d7d11fe13ce7b3a01b77e1002a78e53d99f83.zip | |
Remove netcon from dev branch. This is moving to its own new ZeroTierSDK repo for future release under the SDK name.
Diffstat (limited to 'make-linux.mk')
| -rw-r--r-- | make-linux.mk | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/make-linux.mk b/make-linux.mk index 13bc53ad..7cacb4fa 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -131,19 +131,6 @@ one: $(OBJS) service/OneService.o one.o osdep/LinuxEthernetTap.o ln -sf zerotier-one zerotier-idtool ln -sf zerotier-one zerotier-cli -# This is going away -- netcon is becoming the ZeroTier SDK and is going into a separate repo -netcon: $(OBJS) - rm -f *.o - # Need to selectively rebuild one.cpp and OneService.cpp with ZT_SERVICE_NETCON and ZT_ONE_NO_ROOT_CHECK defined, and also NetconEthernetTap - $(CXX) $(CXXFLAGS) $(LDFLAGS) -DZT_SERVICE_NETCON -DZT_ONE_NO_ROOT_CHECK -Iext/lwip/src/include -Iext/lwip/src/include/ipv4 -Iext/lwip/src/include/ipv6 -o zerotier-netcon-service $(OBJS) service/OneService.cpp netcon/NetconEthernetTap.cpp one.cpp -x c netcon/RPC.c $(LDLIBS) -ldl - # Build netcon/liblwip.so which must be placed in ZT home for zerotier-netcon-service to work - cd netcon ; make -f make-liblwip.mk - # Use gcc not clang to build standalone intercept library since gcc is typically used for libc and we want to ensure maximal ABI compatibility - cd netcon ; gcc -g -O2 -Wall -std=c99 -fPIC -DVERBOSE -D_GNU_SOURCE -DNETCON_INTERCEPT -I. -nostdlib -shared -o libzerotierintercept.so Intercept.c RPC.c -ldl - cp netcon/libzerotierintercept.so libzerotierintercept.so - ln -sf zerotier-netcon-service zerotier-cli - ln -sf zerotier-netcon-service zerotier-idtool - selftest: $(OBJS) selftest.o $(CXX) $(CXXFLAGS) $(LDFLAGS) -o zerotier-selftest selftest.o $(OBJS) $(LDLIBS) $(STRIP) zerotier-selftest @@ -154,9 +141,7 @@ manpages: FORCE doc: manpages 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 doc/*.1 doc/*.2 doc/*.8 debian/files debian/zerotier-one*.debhelper debian/zerotier-one.substvars debian/*.log debian/zerotier-one - 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 + rm -rf *.so *.o 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 build-* ZeroTierOneInstaller-* *.deb *.rpm .depend doc/*.1 doc/*.2 doc/*.8 debian/files debian/zerotier-one*.debhelper debian/zerotier-one.substvars debian/*.log debian/zerotier-one distclean: clean rm -rf doc/node_modules |