From 38a0d7247842ee9c2dc1ec70b3cd50111b15d814 Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Tue, 19 Apr 2016 13:00:45 +0200 Subject: Revert "Minor fixes, working version" This reverts commit 3bb6c38ed17c2cf0d2f68bb64fbd24737c4a6677. --- Makefile | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index fb3d369..e98e631 100644 --- a/Makefile +++ b/Makefile @@ -6,14 +6,13 @@ INCLUDE = -Iinclude/ LIB = -lhidapi-libusb BUILD = build -CXXFLAGS = -std=c++14 -fPIC -SOFLAGS = -shared +CXXFLAGS = -std=c++14 CXXSOURCES = $(wildcard *.cc) -OBJ = $(CXXSOURCES:%.cc=$(BUILD)/%.o) +OBJ = $(CXXSOURCES:%.cc:$(BUILD)/%.o) $(BUILD)/libnitrokey.so: $(OBJ) - $(CXX) $(SOFLAGS) $(OBJ) -o $@ + $(CXX) -shared $(OBJ) -o $@ $(BUILD)/%.o: %.cc $(CXX) -c $< -o $@ $(INCLUDE) $(CXXFLAGS) @@ -21,17 +20,12 @@ $(BUILD)/%.o: %.cc all: $(OBJ) $(BUILD)/libnitrokey.so clean: - rm -f $(OBJ) - rm -f $(BUILD)/libnitrokey.so - make -C unittest clean + rm $(OBJ) + rm $(BUILD)/libnitrokey.so mrproper: clean - rm -f $(BUILD)/*.d + rm $(BUILD)/*.d -unittest: all - make -C unittest - cd unittest/build && ln -fs ../../build/libnitrokey.so . - -.PHONY: all clean mrproper unittest +.PHONY: all clean mrproper include $(wildcard build/*.d) -- cgit v1.2.3