From bfdca4825a645c9e355eefb6b291b72c41d7e969 Mon Sep 17 00:00:00 2001 From: Emiel Bruijntjes Date: Mon, 2 Nov 2015 09:08:30 +0100 Subject: [PATCH] added "make pure" option, to make the library without tcp support --- Makefile | 3 +++ src/Makefile | 46 +++++++++++++++++++++++++++------------------- 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index 8cdeaa7..b5c6d85 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,9 @@ export VERSION = 2.2.3 all: $(MAKE) -C src all +pure: + $(MAKE) -C src pure + release: $(MAKE) -C src release diff --git a/src/Makefile b/src/Makefile index 10b81ca..52f8eeb 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,14 +1,16 @@ -CPP = g++ -RM = rm -f -CPPFLAGS = -Wall -c -I. -std=c++11 -LD = g++ -LD_FLAGS = -Wall -shared -SHARED_LIB = lib$(LIBRARY_NAME).so.$(VERSION) -STATIC_LIB = lib$(LIBRARY_NAME).a.$(VERSION) -STATIC_FPIC_LIB = lib$(LIBRARY_NAME)_fpic.a -SOURCES = $(wildcard *.cpp) -SHARED_OBJECTS = $(SOURCES:%.cpp=%.o) -STATIC_OBJECTS = $(SOURCES:%.cpp=%.s.o) +CPP = g++ +RM = rm -f +CPPFLAGS = -Wall -c -I. -std=c++11 +LD = g++ +LD_FLAGS = -Wall -shared +SHARED_LIB = lib$(LIBRARY_NAME).so.$(VERSION) +STATIC_LIB = lib$(LIBRARY_NAME).a.$(VERSION) +STATIC_FPIC_LIB = lib$(LIBRARY_NAME)_fpic.a +SOURCES = $(wildcard *.cpp) +SHARED_OBJECTS = $(SOURCES:%.cpp=%.o) +STATIC_OBJECTS = $(SOURCES:%.cpp=%.s.o) +PURE_SHARED_OBJECTS = $(filter-out tcpconnection.o, $(SOURCES:%.cpp=%.o)) +PURE_STATIC_OBJECTS = $(filter-out tcpconnection.s.o, $(SOURCES:%.cpp=%.s.o)) ifeq ($(shell uname -s),Darwin) @@ -18,17 +20,23 @@ else endif -all: CPPFLAGS += -g -all: LD_FLAGS += -g -all: shared static +all: CPPFLAGS += -g +all: LD_FLAGS += -g +all: shared static -release: CPPFLAGS += -O2 -release: LD_FLAGS += -O2 -release: shared static +pure: CPPFLAGS += -g +pure: LD_FLAGS += -g +pure: shared_pure static_pure -shared: ${SHARED_OBJECTS} ${SHARED_LIB} +release: CPPFLAGS += -O2 +release: LD_FLAGS += -O2 +release: shared static -static: ${STATIC_OBJECTS} ${STATIC_LIB} +shared: ${SHARED_OBJECTS} ${SHARED_LIB} +shared_pure: ${PURE_SHARED_OBJECTS} ${SHARED_LIB} + +static: ${STATIC_OBJECTS} ${STATIC_LIB} +static_pure: ${PURE_STATIC_OBJECTS} ${STATIC_LIB} static_fpic: ${STATIC_FPIC_LIB} ${SHARED_OBJECTS}