diff options
| author | Szczepan Zalega <szczepan.zalega@gmail.com> | 2016-04-19 13:00:45 +0200 |
|---|---|---|
| committer | Szczepan Zalega <szczepan.zalega@gmail.com> | 2016-04-19 13:00:45 +0200 |
| commit | 38a0d7247842ee9c2dc1ec70b3cd50111b15d814 (patch) | |
| tree | 6ea7d96063a1cc93434b0d6c8af366d9646b24ca /Makefile | |
| parent | 1778e7de61db4ac75b07b998e625197a40986ca2 (diff) | |
| download | libnitrokey-38a0d7247842ee9c2dc1ec70b3cd50111b15d814.tar.gz libnitrokey-38a0d7247842ee9c2dc1ec70b3cd50111b15d814.tar.bz2 | |
Revert "Minor fixes, working version"
This reverts commit 3bb6c38ed17c2cf0d2f68bb64fbd24737c4a6677.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 20 |
1 files changed, 7 insertions, 13 deletions
@@ -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) |