Platform independent build

ChangeLog

@@ -1,3 +1,9 @@
+libqpack (0.10.3)
+
+  * Make build script platform independent.
+
+ -- Jeroen van der Heijden <jeroen@transceptor.technology>  31 Aug 2017
+
 libqpack (0.10.2)
 
   * Added qp_sprint() for printing qp data to a string. Like qp_fprint() the

Debug/makefile

@@ -19,22 +19,31 @@ endif
 
 -include ../makefile.defs
 
+OS := $(shell uname)
+ifeq ($(OS),Darwin)
+FN := libqpack.dylib
+INSTALL_PATH := /usr/local
+else
+FN := libqpack.so
+INSTALL_PATH := /usr
+endif
+
 # Add inputs and outputs from these tool invocations to the build variables
 
 # All Target
-all: libqpack.so
+all: libqpack
 
 # Tool invocations
-libqpack.so: $(OBJS) $(USER_OBJS)
+libqpack: $(OBJS) $(USER_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: Cross GCC Linker'
-	gcc -shared -o "libqpack.so" $(OBJS) $(USER_OBJS) $(LIBS)
+	gcc -shared -o $(FN) $(OBJS) $(USER_OBJS) $(LIBS) $(LDFLAGS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 
 # Other Targets
 clean:
-	-$(RM) $(LIBRARIES)$(OBJS)$(C_DEPS) libqpack.so
+	-$(RM) $(LIBRARIES)$(OBJS)$(C_DEPS) $(FN)
 	-@echo ' '
 
 .PHONY: all clean dependents

Release/makefile

@@ -19,22 +19,31 @@ endif
 
 -include ../makefile.defs
 
+OS := $(shell uname)
+ifeq ($(OS),Darwin)
+FN := libqpack.dylib
+INSTALL_PATH := /usr/local
+else
+FN := libqpack.so
+INSTALL_PATH := /usr
+endif
+
 # Add inputs and outputs from these tool invocations to the build variables
 
 # All Target
-all: libqpack.so
+all: libqpack
 
 # Tool invocations
-libqpack.so: $(OBJS) $(USER_OBJS)
+libqpack: $(OBJS) $(USER_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: Cross GCC Linker'
-	gcc -shared -o "libqpack.so" $(OBJS) $(USER_OBJS) $(LIBS)
+	gcc -shared -o $(FN) $(OBJS) $(USER_OBJS) $(LIBS) $(LDFLAGS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 
 # Other Targets
 clean:
-	-$(RM) $(LIBRARIES)$(OBJS)$(C_DEPS) libqpack.so
+	-$(RM) $(LIBRARIES)$(OBJS)$(C_DEPS) $(FN)
 	-@echo ' '
 
 .PHONY: all clean dependents

makefile.targets

@@ -1,9 +1,9 @@
 .PHONY: install
 install:
-	@cp ../qpack.h /usr/include/qpack.h
-	@cp libqpack.so /usr/lib/x86_64-linux-gnu/libqpack.so
+	@cp ../qpack.h $(INSTALL_PATH)/include/qpack.h
+	@cp $(FN) $(INSTALL_PATH)/lib/$(FN)
 
 .PHONY: uninstall
 uninstall:
-	@rm -f /usr/include/qpack.h
-	@rm -f /usr/lib/x86_64-linux-gnu/libqpack.so
+	@rm -f $(INSTALL_PATH)/include/qpack.h
+	@rm -f $(INSTALL_PATH)/lib/$(FN)

qpack.h

@@ -10,7 +10,7 @@
 
 #define QP_VERSION_MAJOR 0
 #define QP_VERSION_MINOR 10
-#define QP_VERSION_PATCH 2
+#define QP_VERSION_PATCH 3
 
 #define QP_STRINGIFY(num) #num
 #define QP_VERSION_STR(major,minor,patch)   \