From e7eba249f59f22c141aa9c70b4b05bda4bc522a6 Mon Sep 17 00:00:00 2001
From: Michael Kuc <michaelkuc6@gmail.com>
Date: Sat, 22 Jun 2019 12:32:45 +0100
Subject: [PATCH] Fixed build.

---
 Makefile                    | 12 ++++++------
 Scripts/cpp-base64-Makefile |  5 ++---
 Scripts/uECC-Makefile       | 12 +++++-------
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index e46e668..8967762 100755
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ CXXFLAGS += -MMD -MP -Wall -Wfatal-errors -Wextra
 MODULES  := $(wildcard $(SRC_DIR)/*.cpp)
 OBJECTS  := $(MODULES:$(SRC_DIR)/%.cpp=$(OBJ_DIR)/%.o)
 
-U2FDevice: $(OBJECTS) libuECC.o libcppb64.o
+U2FDevice: $(OBJECTS) libuECC.a libcppb64.a
 	$(CXX) $(LDFLAGS) -o $@ $^
 
 install: U2FDevice
@@ -28,14 +28,14 @@ $(OBJ_DIR):
 
 clean:
 	rm $(OBJ_DIR)/*
-	rm U2FDevice libuECC.o libcppb64.o
+	rm U2FDevice libuECC.a libcppb64.a
 
 .PHONY: clean install
 
-libuECC.o:
+libuECC.a:
 	$(MAKE) -C micro-ecc
-	cp micro-ecc/libuECC.o libuECC.o
+	cp micro-ecc/libuECC.a libuECC.a
 
-libcppb64.o:
+libcppb64.a:
 	$(MAKE) -C cpp-base64
-	cp cpp-base64/libcppb64.o libcppb64.o
+	cp cpp-base64/libcppb64.a libcppb64.a
diff --git a/Scripts/cpp-base64-Makefile b/Scripts/cpp-base64-Makefile
index b8db2b0..68825b5 100755
--- a/Scripts/cpp-base64-Makefile
+++ b/Scripts/cpp-base64-Makefile
@@ -2,7 +2,6 @@
 
 SRC_DIR  := .
 OBJ_DIR  := .
-LDFLAGS  := -r
 CPPFLAGS :=
 CXXFLAGS := --std=c++14
 
@@ -10,8 +9,8 @@ CXXFLAGS += -MMD -MP
 MODULESC := $(SRC_DIR)/base64.cpp
 OBJECTS := $(MODULESC:$(SRC_DIR)/%.cpp=$(OBJ_DIR)/%.o)
 
-libcppb64.o: $(OBJECTS)
-	$(CXX) $(LDFLAGS) -o $@ $^
+libcppb64.a: $(OBJECTS)
+	ar rcs $@ $^
 
 $(OBJECTS): $(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp
 	@mkdir -p $(@D)
diff --git a/Scripts/uECC-Makefile b/Scripts/uECC-Makefile
index fd6ddcc..fc81ef5 100755
--- a/Scripts/uECC-Makefile
+++ b/Scripts/uECC-Makefile
@@ -2,26 +2,24 @@
 
 SRC_DIR  := .
 OBJ_DIR  := obj
-LDFLAGS  := -r
 CPPFLAGS :=
-CXXFLAGS := --std=c++14
 
-CXXFLAGS += -MMD -MP
+CFLAGS   := -MMD -MP
 MODULESC := $(wildcard $(SRC_DIR)/*.c)
 MODULESI := $(SRC_DIR)/curve-specific.inc
 OBJECTSC := $(MODULESC:$(SRC_DIR)/%.c=$(OBJ_DIR)/%.o)
 OBJECTSI := $(MODULESI:$(SRC_DIR)/%.inc=$(OBJ_DIR)/%.o)
 OBJECTS  := $(OBJECTSC) $(OBJECTSI)
 
-libuECC.o: $(OBJECTS)
-	$(CXX) $(LDFLAGS) -o $@ $^
+libuECC.a: $(OBJECTS)
+	ar rcs $@ $^
 
 $(OBJECTSC): $(OBJ_DIR)/%.o: $(SRC_DIR)/%.c
 	@mkdir -p $(@D)
-	@$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
+	@$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
 
 $(OBJECTSI): $(OBJ_DIR)/%.o: $(SRC_DIR)/%.inc
 	@mkdir -p $(@D)
-	@$(CXX) -x c $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
+	@$(CC) -x c $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
 
 -include $(OBJECTS:.o=.d)