|
@@ -9,9 +9,9 @@ ifeq ($(origin CXX),default)
|
|
CXX:=$(shell if [ -e /opt/rh/devtoolset-8/root/usr/bin/g++ ]; then echo /opt/rh/devtoolset-8/root/usr/bin/g++; else echo $(CXX); fi)
|
|
CXX:=$(shell if [ -e /opt/rh/devtoolset-8/root/usr/bin/g++ ]; then echo /opt/rh/devtoolset-8/root/usr/bin/g++; else echo $(CXX); fi)
|
|
endif
|
|
endif
|
|
|
|
|
|
-INCLUDES?=
|
|
|
|
|
|
+INCLUDES?=-Izeroidc/target
|
|
DEFS?=
|
|
DEFS?=
|
|
-LDLIBS?=
|
|
|
|
|
|
+LDLIBS?=zeroidc/target/release/libzeroidc.a -ldl
|
|
DESTDIR?=
|
|
DESTDIR?=
|
|
|
|
|
|
include objects.mk
|
|
include objects.mk
|
|
@@ -311,6 +311,8 @@ zerotier-idtool: zerotier-one
|
|
zerotier-cli: zerotier-one
|
|
zerotier-cli: zerotier-one
|
|
ln -sf zerotier-one zerotier-cli
|
|
ln -sf zerotier-one zerotier-cli
|
|
|
|
|
|
|
|
+$(CORE_OBJS): zeroidc
|
|
|
|
+
|
|
libzerotiercore.a: FORCE
|
|
libzerotiercore.a: FORCE
|
|
make CFLAGS="-O3 -fstack-protector -fPIC" CXXFLAGS="-O3 -std=c++11 -fstack-protector -fPIC" $(CORE_OBJS)
|
|
make CFLAGS="-O3 -fstack-protector -fPIC" CXXFLAGS="-O3 -std=c++11 -fstack-protector -fPIC" $(CORE_OBJS)
|
|
ar rcs libzerotiercore.a $(CORE_OBJS)
|
|
ar rcs libzerotiercore.a $(CORE_OBJS)
|
|
@@ -329,7 +331,7 @@ manpages: FORCE
|
|
doc: manpages
|
|
doc: manpages
|
|
|
|
|
|
clean: FORCE
|
|
clean: FORCE
|
|
- rm -rf *.a *.so *.o node/*.o controller/*.o osdep/*.o service/*.o ext/http-parser/*.o ext/miniupnpc/*.o ext/libnatpmp/*.o $(CORE_OBJS) $(ONE_OBJS) zerotier-one zerotier-idtool zerotier-cli zerotier-selftest build-* ZeroTierOneInstaller-* *.deb *.rpm .depend debian/files debian/zerotier-one*.debhelper debian/zerotier-one.substvars debian/*.log debian/zerotier-one doc/node_modules ext/misc/*.o debian/.debhelper debian/debhelper-build-stamp docker/zerotier-one
|
|
|
|
|
|
+ rm -rf *.a *.so *.o node/*.o controller/*.o osdep/*.o service/*.o ext/http-parser/*.o ext/miniupnpc/*.o ext/libnatpmp/*.o $(CORE_OBJS) $(ONE_OBJS) zerotier-one zerotier-idtool zerotier-cli zerotier-selftest build-* ZeroTierOneInstaller-* *.deb *.rpm .depend debian/files debian/zerotier-one*.debhelper debian/zerotier-one.substvars debian/*.log debian/zerotier-one doc/node_modules ext/misc/*.o debian/.debhelper debian/debhelper-build-stamp docker/zerotier-one zeroidc/target
|
|
|
|
|
|
distclean: clean
|
|
distclean: clean
|
|
|
|
|
|
@@ -351,6 +353,9 @@ debug: FORCE
|
|
make ZT_DEBUG=1 one
|
|
make ZT_DEBUG=1 one
|
|
make ZT_DEBUG=1 selftest
|
|
make ZT_DEBUG=1 selftest
|
|
|
|
|
|
|
|
+zeroidc: FORCE
|
|
|
|
+ cd zeroidc && cargo build --release
|
|
|
|
+
|
|
# Note: keep the symlinks in /var/lib/zerotier-one to the binaries since these
|
|
# Note: keep the symlinks in /var/lib/zerotier-one to the binaries since these
|
|
# provide backward compatibility with old releases where the binaries actually
|
|
# provide backward compatibility with old releases where the binaries actually
|
|
# lived here. Folks got scripts.
|
|
# lived here. Folks got scripts.
|