From 9b8ebc6ed1a1fdc15c404774bf102c883a34d990 Mon Sep 17 00:00:00 2001
From: Mateusz Zalega <mateusz@appliedsourcery.com>
Date: Thu, 22 Oct 2015 23:07:23 +0200
Subject: Minor fixes, working version

---
 Makefile | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index e98e631..c5a4435 100644
--- a/Makefile
+++ b/Makefile
@@ -6,26 +6,37 @@ INCLUDE = -Iinclude/
 LIB = -lhidapi-libusb
 BUILD = build
 
-CXXFLAGS = -std=c++14
+CXXFLAGS = -std=c++14 -fPIC
+SOFLAGS = -shared
 
 CXXSOURCES = $(wildcard *.cc)
-OBJ = $(CXXSOURCES:%.cc:$(BUILD)/%.o)
+OBJ = $(CXXSOURCES:%.cc=$(BUILD)/%.o)
+DEPENDS = $(CXXSOURCES:%.cc=$(BUILD)/%.d)
 
-$(BUILD)/libnitrokey.so: $(OBJ)
-	$(CXX) -shared $(OBJ) -o $@
+all: $(OBJ) $(BUILD)/libnitrokey.so unittest
 
-$(BUILD)/%.o: %.cc
-	$(CXX) -c $< -o $@ $(INCLUDE) $(CXXFLAGS)
+$(BUILD)/libnitrokey.so: $(OBJ) $(DEPENDS)
+	$(CXX) $(SOFLAGS) $(OBJ) -o $@
+
+$(BUILD)/%.d: %.cc
+	$(CXX) -M $< -o $@ $(INCLUDE) $(CXXFLAGS)
 
-all: $(OBJ) $(BUILD)/libnitrokey.so
+$(BUILD)/%.o: %.cc $(DEPENDS)
+	$(CXX) -c $< -o $@ $(INCLUDE) $(CXXFLAGS)
 
 clean:
-	rm $(OBJ)
-	rm $(BUILD)/libnitrokey.so
+	rm -f $(OBJ)
+	rm -f $(BUILD)/libnitrokey.so
+	make -C unittest clean
 
 mrproper: clean
-	rm $(BUILD)/*.d
+	rm -f $(BUILD)/*.d
+	make -C unittest mrproper
+
+unittest: $(BUILD)/libnitrokey.so
+	make -C unittest
+	cd unittest/build && ln -fs ../../build/libnitrokey.so .
 
-.PHONY: all clean mrproper
+.PHONY: all clean mrproper unittest
 
 include $(wildcard build/*.d)
-- 
cgit v1.2.1