Merge of netcon with edge and unification of make processes.

This commit is contained in:
Adam Ierymenko 2015-12-04 13:19:31 -08:00
commit 425d311ce8
13 changed files with 36 additions and 148 deletions

View file

@ -71,8 +71,8 @@ CXXFLAGS=$(CFLAGS) -fno-rtti
all: one
one: $(OBJS) one.o
$(CXX) $(CXXFLAGS) -o zerotier-one $(OBJS) one.o $(LIBS)
one: $(OBJS) service/OneService.o one.o
$(CXX) $(CXXFLAGS) -o zerotier-one $(OBJS) service/OneService.o one.o $(LIBS)
$(STRIP) zerotier-one
ln -sf zerotier-one zerotier-idtool
ln -sf zerotier-one zerotier-cli