From 0153be109325bf52a854dbfe9cc8bca759b00637 Mon Sep 17 00:00:00 2001
From: Justin Lecher <jlec@gentoo.org>
Date: Thu, 30 Aug 2012 11:01:16 +0200
Subject: [PATCH 1/2] Enhance Makefile

LDFLAGS are not for libs but for linker flags
Allow CXX and CXXFLAGS from env
Use CXXFLAGS for c++ code

Signed-off-by: Justin Lecher <jlec@gentoo.org>
---
 Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index ce04ed9..862daa3 100644
--- a/Makefile
+++ b/Makefile
@@ -15,9 +15,9 @@ LIBS = -Llib \
 	   -lpthread \
 	   -lusb-1.0
 
-CXX = g++
-CFLAGS = -Wall -O2 -g $(INCLUDES)
-LDFLAGS = $(LIBS) 
+CXX ?= g++
+CXXFLAGS ?= -Wall -O2 -g
+CPPFLAGS += $(INCLUDES)
 
 all: $(OUT)
 
@@ -26,7 +26,7 @@ $(OUT): lib/libnvstusb.a $(OBJ)
 	@echo "============================================================"
 	@echo "    Linking..."
 	@echo "============================================================"
-	$(CXX) -o $@ $(OBJ) $(LDFLAGS)
+	$(CXX) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
 	@echo ""
 	@echo "============================================================"
 	@echo "    Done."
@@ -43,7 +43,7 @@ lib/libnvstusb.a:
 	@echo "============================================================"
 
 .cpp.o:
-	$(CXX) -c $(CFLAGS) -o $@ $<
+	$(CXX) $(CPPFLAGS) -c $(CXXFLAGS) -o $@ $<
 
 clean:
 	make -C lib clean

From b2bab8d9b6b6c29d26aee3414ea834227892b79b Mon Sep 17 00:00:00 2001
From: Justin Lecher <jlec@gentoo.org>
Date: Thu, 30 Aug 2012 11:05:39 +0200
Subject: [PATCH 2/2] Respect user env during compilation

Also respect env in subdirs

Signed-off-by: Justin Lecher <jlec@gentoo.org>
---
 lib/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Makefile b/lib/Makefile
index 97a3f64..68d75b2 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -2,8 +2,8 @@ SRC = usb_libusb.c nvstusb.c
 OBJ = $(SRC:.c=.o)
 OUT = libnvstusb.a
 
-CC = gcc
-CFLAGS = -O2 -g
+CC ?= gcc
+CFLAGS ?= -O2 -g
 
 all: $(OUT)