From 5fa7760e53a0a0234983bfad622f6614374989c2 Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Fri, 31 Aug 2018 01:25:29 +0200
Subject: [PATCH 1/2] makefile: Use standard variables and reuse the
 environment

---
 makefile | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/makefile b/makefile
index 019636d..bb3f368 100644
--- a/makefile
+++ b/makefile
@@ -1,18 +1,18 @@
-CC=g++
-CFLAGS=-Wall -O2 -std=gnu++11
+CXX?=g++
+CXXFLAGS?=-Wall -O2 -std=gnu++11
 LIB?=hidapi
 ifeq ($(LIB),libusb)
 	CPPFLAGS=-Dlibusb
-	LDFLAGS=-lusb-1.0
+	LDFLAGS+=-lusb-1.0
 else
 	CPPFLAGS=-Dhidapi
-	LDFLAGS=-lhidapi-hidraw
+	LDFLAGS+=-lhidapi-hidraw
 endif
 SYSTEMDDIR?=/usr/lib/systemd
 
-prefix?=$(DESTDIR)/usr
-libdir?=$(prefix)/lib
-includedir?=$(prefix)/include
+PREFIX?=$(DESTDIR)/usr
+libdir?=$(PREFIX)/lib
+includedir?=$(PREFIX)/include
 
 # Program & versioning information
 PROGN=g810-led
@@ -20,7 +20,7 @@ MAJOR=0
 MINOR=2
 MICRO=7
 
-CFLAGS+=-DVERSION=\"$(MAJOR).$(MINOR).$(MICRO)\"
+CXXFLAGS+=-DVERSION=\"$(MAJOR).$(MINOR).$(MICRO)\"
 APPSRCS=src/main.cpp src/helpers/*.cpp src/helpers/*.h
 LIBSRCS=src/classes/*.cpp src/classes/*.h
 
@@ -32,19 +32,19 @@ bin: bin/$(PROGN)
 
 bin/$(PROGN): $(APPSRCS) $(LIBSRCS)
 	@mkdir -p bin
-	$(CC) $(CPPFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS)
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $^ -o $@ $(LDFLAGS)
 	
-debug: CFLAGS += -g -Wextra -pedantic
+debug: CXXFLAGS += -g -Wextra -pedantic
 debug: bin/$(PROGN)
 
 lib/lib$(PROGN).so: $(LIBSRCS)
 	@mkdir -p lib
-	$(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -shared -Wl,-soname,lib$(PROGN).so -o lib/lib$(PROGN).so.$(MAJOR).$(MINOR).$(MICRO) $^ $(LDFLAGS)
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -fPIC -shared -Wl,-soname,lib$(PROGN).so -o lib/lib$(PROGN).so.$(MAJOR).$(MINOR).$(MICRO) $^ $(LDFLAGS)
 	@ln -sf lib$(PROGN).so.$(MAJOR).$(MINOR).$(MICRO) lib/lib$(PROGN).so
 
 bin-linked: lib/lib$(PROGN).so
 	@mkdir -p bin
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(APPSRCS) -o bin/$(PROGN) $(LDFLAGS) -L./lib -l$(PROGN)
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(APPSRCS) -o bin/$(PROGN) $(LDFLAGS) -L./lib -l$(PROGN)
 
 lib: lib/lib$(PROGN).so
 

From 87b2de95c94f8828b7d1f1b570d2bab55649b783 Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Sun, 9 Sep 2018 05:15:17 +0200
Subject: [PATCH 2/2] makefile: Fix issues on code review

Code review: https://github.com/gentoo/gentoo/pull/9476#discussion_r216123340
---
 makefile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/makefile b/makefile
index bb3f368..707517d 100644
--- a/makefile
+++ b/makefile
@@ -1,12 +1,12 @@
 CXX?=g++
-CXXFLAGS?=-Wall -O2 -std=gnu++11
+CXXFLAGS?=-Wall -O2
 LIB?=hidapi
 ifeq ($(LIB),libusb)
 	CPPFLAGS=-Dlibusb
-	LDFLAGS+=-lusb-1.0
+	LIBS=-lusb-1.0
 else
 	CPPFLAGS=-Dhidapi
-	LDFLAGS+=-lhidapi-hidraw
+	LIBS=-lhidapi-hidraw
 endif
 SYSTEMDDIR?=/usr/lib/systemd
 
@@ -20,7 +20,7 @@ MAJOR=0
 MINOR=2
 MICRO=7
 
-CXXFLAGS+=-DVERSION=\"$(MAJOR).$(MINOR).$(MICRO)\"
+CXXFLAGS+=-std=gnu++11 -DVERSION=\"$(MAJOR).$(MINOR).$(MICRO)\"
 APPSRCS=src/main.cpp src/helpers/*.cpp src/helpers/*.h
 LIBSRCS=src/classes/*.cpp src/classes/*.h
 
@@ -32,19 +32,19 @@ bin: bin/$(PROGN)
 
 bin/$(PROGN): $(APPSRCS) $(LIBSRCS)
 	@mkdir -p bin
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $^ -o $@ $(LDFLAGS)
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS)
 	
 debug: CXXFLAGS += -g -Wextra -pedantic
 debug: bin/$(PROGN)
 
 lib/lib$(PROGN).so: $(LIBSRCS)
 	@mkdir -p lib
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -fPIC -shared -Wl,-soname,lib$(PROGN).so -o lib/lib$(PROGN).so.$(MAJOR).$(MINOR).$(MICRO) $^ $(LDFLAGS)
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -fPIC -shared -Wl,-soname,lib$(PROGN).so -o lib/lib$(PROGN).so.$(MAJOR).$(MINOR).$(MICRO) $^ $(LIBS)
 	@ln -sf lib$(PROGN).so.$(MAJOR).$(MINOR).$(MICRO) lib/lib$(PROGN).so
 
 bin-linked: lib/lib$(PROGN).so
 	@mkdir -p bin
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(APPSRCS) -o bin/$(PROGN) $(LDFLAGS) -L./lib -l$(PROGN)
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $(APPSRCS) -o bin/$(PROGN) $(LIBS) -L./lib -l$(PROGN)
 
 lib: lib/lib$(PROGN).so