Added a static fpic target which will allow us to statically link thi…

…s library into other shared libraries

For this exact reason we also got rid of -flto, which is pretty useless inside libraries anyway.

.gitignore

@@ -7,10 +7,10 @@
 *.d
 
 # Compiled Dynamic libraries
-*.so
+*.so*
 *.dylib
 
 # Compiled Static libraries
 *.lai
 *.la
-*.a
+*.a*

Makefile

@@ -17,6 +17,9 @@ static:
 shared:
 		$(MAKE) -C src shared
 
+static_fpic:
+		$(MAKE) -C src static_fpic
+
 clean:
 		$(MAKE) -C src clean
 
@@ -33,8 +36,9 @@ install:
 		cp -f include/net/*.h ${INCLUDE_DIR}/$(LIBRARY_NAME)/net
 		cp -f include/tcp/*.h ${INCLUDE_DIR}/$(LIBRARY_NAME)/tcp
 		cp -f include/watchers/*.h ${INCLUDE_DIR}/$(LIBRARY_NAME)/watchers
-		cp -f src/lib$(LIBRARY_NAME).so.$(VERSION) ${LIBRARY_DIR}
-		cp -f src/lib$(LIBRARY_NAME).a.$(VERSION) ${LIBRARY_DIR}
+		-cp -f src/lib$(LIBRARY_NAME).so.$(VERSION) ${LIBRARY_DIR}
+		-cp -f src/lib$(LIBRARY_NAME).a.$(VERSION) ${LIBRARY_DIR}
+		-cp -f src/lib$(LIBRARY_NAME)_fpic.a ${LIBRARY_DIR}
 		ln -s -f lib$(LIBRARY_NAME).so.$(VERSION) $(LIBRARY_DIR)/lib$(LIBRARY_NAME).so.$(SONAME)
 		ln -s -f lib$(LIBRARY_NAME).so.$(VERSION) $(LIBRARY_DIR)/lib$(LIBRARY_NAME).so
 		ln -s -f lib$(LIBRARY_NAME).a.$(VERSION) $(LIBRARY_DIR)/lib$(LIBRARY_NAME).a

src/Makefile

@@ -1,11 +1,12 @@
-CPP		        = g++
-RM		        = rm -f
-CPPFLAGS	    = -Wall -MMD -c -I. -flto -std=c++11
-LD		        = g++
-LD_FLAGS		= -Wall -shared
-SHARED_LIB		= lib$(LIBRARY_NAME).so.$(VERSION)
-STATIC_LIB		= lib$(LIBRARY_NAME).a.$(VERSION)
-SOURCES		    = $(wildcard *.cpp */*.cpp)
+CPP		= g++
+RM		= rm -f
+CPPFLAGS	= -Wall -MMD -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 */*.cpp)
 DEPENDENCIES    = $(SOURCES:%.cpp=%.d)
 SHARED_OBJECTS	= $(SOURCES:%.cpp=%.o)
 STATIC_OBJECTS	= $(SOURCES:%.cpp=%.s.o)
@@ -22,6 +23,8 @@ release:	shared static
 
 shared:	${SHARED_OBJECTS} ${SHARED_LIB}
 
+static_fpic: ${SHARED_OBJECTS} ${STATIC_FPIC_LIB}
+
 static:	${STATIC_OBJECTS} ${STATIC_LIB}
 
 ${SHARED_LIB}: ${SHARED_OBJECTS}
@@ -30,6 +33,9 @@ ${SHARED_LIB}: ${SHARED_OBJECTS}
 ${STATIC_LIB}: ${STATIC_OBJECTS}
 	ar rcs ${STATIC_LIB} ${STATIC_OBJECTS}
 
+${STATIC_FPIC_LIB}: ${SHARED_OBJECTS}
+	ar rcs ${STATIC_FPIC_LIB} ${SHARED_OBJECTS}
+
 clean:
 	${RM} *.obj *~* ${SHARED_OBJECTS} ${STATIC_OBJECTS} ${SHARED_LIB} ${STATIC_LIB}