Add "make debug" to make building debug one-offs easier (Linux).

This commit is contained in:
Adam Ierymenko 2014-08-18 10:07:03 -04:00
parent 715afc0314
commit b7b9b9c0b7

View file

@ -6,45 +6,45 @@ INCLUDES=
DEFS= DEFS=
LIBS= LIBS=
# Enable SSE-optimized Salsa20 in all modes
DEFS+=-DZT_SALSA20_SSE
# "make official" is a shortcut for this
ifeq ($(ZT_OFFICIAL_RELEASE),1) ifeq ($(ZT_OFFICIAL_RELEASE),1)
ZT_AUTO_UPDATE=1 ZT_AUTO_UPDATE=1
DEFS+=-DZT_OFFICIAL_RELEASE DEFS+=-DZT_OFFICIAL_RELEASE
endif endif
ifeq ($(ZT_AUTO_UPDATE),1) ifeq ($(ZT_AUTO_UPDATE),1)
DEFS+=-DZT_AUTO_UPDATE DEFS+=-DZT_AUTO_UPDATE
endif endif
# Enable SSE-optimized Salsa20 # "make debug" is a shortcut for this
DEFS+=-DZT_SALSA20_SSE ifeq ($(ZT_DEBUG),1)
CFLAGS=-Wall -g -pthread $(INCLUDES) -DZT_TRACE -DZT_LOG_STDOUT $(DEFS)
# Uncomment to dump trace and log to stdout LDFLAGS=
#DEFS+=-DZT_TRACE -DZT_LOG_STDOUT STRIP=echo
DEFS+=-DZT_TRACE -DZT_LOG_STDOUT
# Uncomment for a release optimized build else
CFLAGS=-Wall -O3 -fPIE -fvisibility=hidden -fstack-protector -pthread $(INCLUDES) -DNDEBUG $(DEFS) CFLAGS=-Wall -O3 -fPIE -fvisibility=hidden -fstack-protector -pthread $(INCLUDES) -DNDEBUG $(DEFS)
LDFLAGS=-pie -Wl,-z,relro,-z,now LDFLAGS=-pie -Wl,-z,relro,-z,now
STRIP=strip --strip-all STRIP=strip --strip-all
endif
# Uncomment for a debug build
#CFLAGS=-Wall -g -pthread $(INCLUDES) -DZT_TRACE -DZT_LOG_STDOUT $(DEFS)
#LDFLAGS=
#STRIP=echo
# Uncomment for gprof profile build # Uncomment for gprof profile build
#CFLAGS=-Wall -g -pg -pthread $(INCLUDES) $(DEFS) #CFLAGS=-Wall -g -pg -pthread $(INCLUDES) $(DEFS)
#LDFLAGS= #LDFLAGS=
#STRIP=echo #STRIP=echo
# Our code doesn't use rtti, so don't bloat the binary with it.
CXXFLAGS=$(CFLAGS) -fno-rtti CXXFLAGS=$(CFLAGS) -fno-rtti
include objects.mk include objects.mk
OBJS+=osnet/LinuxRoutingTable.o osnet/LinuxEthernetTap.o osnet/LinuxEthernetTapFactory.o OBJS+=main.o osnet/LinuxRoutingTable.o osnet/LinuxEthernetTap.o osnet/LinuxEthernetTapFactory.o
all: one all: one
one: $(OBJS) main.o one: $(OBJS)
$(CXX) $(CXXFLAGS) $(LDFLAGS) -o zerotier-one main.o $(OBJS) $(LIBS) $(CXX) $(CXXFLAGS) $(LDFLAGS) -o zerotier-one $(OBJS) $(LIBS)
$(STRIP) zerotier-one $(STRIP) zerotier-one
ln -sf zerotier-one zerotier-cli ln -sf zerotier-one zerotier-cli
ln -sf zerotier-one zerotier-idtool ln -sf zerotier-one zerotier-idtool
@ -57,7 +57,10 @@ installer: one FORCE
./buildinstaller.sh ./buildinstaller.sh
clean: clean:
rm -rf $(OBJS) *.o zerotier-* build-* ZeroTierOneInstaller-* rm -rf $(OBJS) node/*.o osnet/*.o *.o zerotier-* build-* ZeroTierOneInstaller-*
debug: FORCE
make -j 4 ZT_DEBUG=1
official: FORCE official: FORCE
make -j 4 ZT_OFFICIAL_RELEASE=1 make -j 4 ZT_OFFICIAL_RELEASE=1