diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-07-07 19:24:02 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-07-07 19:24:02 -0700 |
| commit | 1ad2cfeedfa2a9f4fc1f512e1009e5bb1b0630cb (patch) | |
| tree | d8264c9bd4f6b9dce3f5237b94fe1f2fc521cf19 /make-linux.mk | |
| parent | 6d398beefddb48d91f27e5f41bf39f40eb77222f (diff) | |
| parent | 412389ec755528108e0254e75a9cf43fc53e331a (diff) | |
| download | infinitytier-1ad2cfeedfa2a9f4fc1f512e1009e5bb1b0630cb.tar.gz infinitytier-1ad2cfeedfa2a9f4fc1f512e1009e5bb1b0630cb.zip | |
Merge branch 'adamierymenko-dev' into android-jni
Diffstat (limited to 'make-linux.mk')
| -rw-r--r-- | make-linux.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/make-linux.mk b/make-linux.mk index 18000c6c..c56f3569 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -22,7 +22,7 @@ CC?=$(shell if [ -e /usr/bin/clang ]; then echo clang; else echo gcc; fi) CXX?=$(shell if [ -e /usr/bin/clang++ ]; then echo clang++; else echo g++; fi) INCLUDES= DEFS= -LIBS= +LDLIBS?= include objects.mk OBJS+=osdep/LinuxEthernetTap.o @@ -35,7 +35,7 @@ endif # Build with ZT_ENABLE_NETWORK_CONTROLLER=1 to build with the Sqlite network controller ifeq ($(ZT_ENABLE_NETWORK_CONTROLLER),1) DEFS+=-DZT_ENABLE_NETWORK_CONTROLLER - LIBS+=-L/usr/local/lib -lsqlite3 + LDLIBS+=-L/usr/local/lib -lsqlite3 OBJS+=controller/SqliteNetworkController.o endif @@ -67,13 +67,13 @@ endif all: one one: $(OBJS) one.o - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o zerotier-one $(OBJS) one.o $(LIBS) + $(CXX) $(CXXFLAGS) $(LDFLAGS) -o zerotier-one $(OBJS) one.o $(LDLIBS) $(STRIP) zerotier-one ln -sf zerotier-one zerotier-idtool ln -sf zerotier-one zerotier-cli selftest: $(OBJS) selftest.o - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o zerotier-selftest selftest.o $(OBJS) $(LIBS) + $(CXX) $(CXXFLAGS) $(LDFLAGS) -o zerotier-selftest selftest.o $(OBJS) $(LDLIBS) $(STRIP) zerotier-selftest installer: one FORCE |