michaelkuc6/U2FDevice
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improved Makefile. Added initial Android support.

Browse Source
This commit is contained in:
Michael Kuc
2019-06-15 22:54:43 +01:00
parent 01b523d072
commit 407d147356
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@@ -11,15 +11,15 @@ MODULES := $(wildcard $(SRC_DIR)/*.cpp)
OBJECTS := $(MODULES:$(SRC_DIR)/%.cpp=$(OBJ_DIR)/%.o) OBJECTS := $(MODULES:$(SRC_DIR)/%.cpp=$(OBJ_DIR)/%.o)
U2FDevice: $(OBJECTS) libuECC.o libcppb64.o U2FDevice: $(OBJECTS) libuECC.o libcppb64.o
g++ $(LDFLAGS) -o $@ $^ $(CXX) $(LDFLAGS) -o $@ $^
install: U2FDevice install: U2FDevice
install -m775 -t /usr/bin U2FDevice install -m775 -t /usr/bin U2FDevice
install -m775 -t /etc/systemd/system Services/U2FDevice.service install -m775 -t /etc/systemd/system Services/U2FDevice.service
install -d /usr/share/U2FDevice/ install -d /usr/share/U2FDevice/
$(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp $(OBJ_DIR) $(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp | $(OBJ_DIR)
g++ $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $< $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
$(OBJ_DIR): $(OBJ_DIR):
mkdir $(OBJ_DIR) mkdir $(OBJ_DIR)
@@ -28,9 +28,10 @@ $(OBJ_DIR):
clean: clean:
rm $(OBJ_DIR)/* rm $(OBJ_DIR)/*
rm U2FDevice rm U2FDevice libuECC.o libcppb64.o
.PHONY: clean install
.PHONY: libuECC.o libcppb64.o clean install
libuECC.o: libuECC.o:
$(MAKE) -C micro-ecc $(MAKE) -C micro-ecc
cp micro-ecc/libuECC.o libuECC.o cp micro-ecc/libuECC.o libuECC.o

4
Scripts/cpp-base64-Makefile
View File

@@ -11,10 +11,10 @@ MODULESC := $(SRC_DIR)/base64.cpp
OBJECTS := $(MODULESC:$(SRC_DIR)/%.cpp=$(OBJ_DIR)/%.o) OBJECTS := $(MODULESC:$(SRC_DIR)/%.cpp=$(OBJ_DIR)/%.o)
libcppb64.o: $(OBJECTS) libcppb64.o: $(OBJECTS)
ld $(LDFLAGS) -o $@ $^ $(CXX) $(LDFLAGS) -o $@ $^
$(OBJECTS): $(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp $(OBJECTS): $(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp
@mkdir -p $(@D) @mkdir -p $(@D)
@g++ $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $< @$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
-include $(OBJECTS:.o=.d) -include $(OBJECTS:.o=.d)

6
Scripts/uECC-Makefile
View File

@@ -14,14 +14,14 @@ OBJECTSI := $(MODULESI:$(SRC_DIR)/%.inc=$(OBJ_DIR)/%.o)
OBJECTS := $(OBJECTSC) $(OBJECTSI) OBJECTS := $(OBJECTSC) $(OBJECTSI)
libuECC.o: $(OBJECTS) libuECC.o: $(OBJECTS)
ld $(LDFLAGS) -o $@ $^ $(CXX) $(LDFLAGS) -o $@ $^
$(OBJECTSC): $(OBJ_DIR)/%.o: $(SRC_DIR)/%.c $(OBJECTSC): $(OBJ_DIR)/%.o: $(SRC_DIR)/%.c
@mkdir -p $(@D) @mkdir -p $(@D)
@g++ $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $< @$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
$(OBJECTSI): $(OBJ_DIR)/%.o: $(SRC_DIR)/%.inc $(OBJECTSI): $(OBJ_DIR)/%.o: $(SRC_DIR)/%.inc
@mkdir -p $(@D) @mkdir -p $(@D)
@g++ -x c $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $< @$(CXX) -x c $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
-include $(OBJECTS:.o=.d) -include $(OBJECTS:.o=.d)