From e7bcb27d2505bd0a87e0e933cfa25461e9c9a51f Mon Sep 17 00:00:00 2001
From: Volker Birk <vb@pep-project.org>
Date: Fri, 5 Apr 2019 21:28:16 +0200
Subject: [PATCH] some Makefile corrections

---
 src/Makefile | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index e8f6e43..5d54427 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,16 +1,16 @@
-.PHONY: all clear install
+.PHONY: clear install
 
 CXX=c++
 CXXFLAGS += -Wall -O0 -std=c++14 -g -glldb -fstack-protector-all
-PREFIX = /usr/local
+PREFIX=/usr/local
 
 # !FIXME!
-GTEST_DIR=$(HOME)/code/googletest/
-
--include local.conf
+GTEST_DIR=/opt/local/src/googletest
 
 all: libpEpMIME.a unittests fuzz
 
+-include local.conf
+
 libpEpMIME.a: pEpMIME.o pEpMIME_internal.o rules.o bodyparser.o \
    headerparser.o parse_timestamp.o parse_address.o nulllogger.o \
    base64.o nfc.o mime_headers.o nfc_sets.o to_utf8.o quoted_printable.o \
@@ -21,7 +21,7 @@ unittests: unittest_mime.o unittest_nfc.o unittest_timestamp.o \
     unittest_stringcase.o unittest_toutf8.o unittest_address.o \
     unittest_rule.o unittest_subject.o \
     gtest-all.o gtest_main.o libpEpMIME.a
-	${CXX} ${CXXFLAGS} -L${HOME}/local/lib/ -o $@ $^ -lpEpAdapter -lpEpEngine -lpthread -liconv
+	${CXX} ${CXXFLAGS} -L${PREFIX}/lib -o $@ $^ -lpEpAdapter -lpEpEngine -lpthread -liconv
 
 gtest-all.o: $(GTEST_DIR)/src/gtest-all.cc
 	${CXX} ${CXXFLAGS} $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -isystem $(GTEST_DIR)/include -o $@ -c $<
@@ -30,16 +30,19 @@ gtest_main.o: $(GTEST_DIR)/src/gtest_main.cc
 	${CXX} ${CXXFLAGS} $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -isystem $(GTEST_DIR)/include -o $@ -c $<
 
 unittest_%.o : unittest_%.cc
-	${CXX} ${CXXFLAGS}  -I${HOME}/local/include/ -I/usr/local/include -isystem $(GTEST_DIR)/include -o $@ -c $<
+	${CXX} ${CXXFLAGS}  -I${PREFIX}/include -isystem $(GTEST_DIR)/include -o $@ -c $<
 
 fuzz: fuzz.o libpEpMIME.a
-	${CXX} ${CXXFLAGS} -L${HOME}/local/lib/ -o $@ $^ -lpEpAdapter -lpEpEngine -lpthread -liconv
+	${CXX} ${CXXFLAGS} -L${PREFIX}/lib -o $@ $^ -lpEpAdapter -lpEpEngine -lpthread -liconv
 
 fuzz.o: fuzz.cc
-	${CXX} ${CXXFLAGS} -I${HOME}/local/include/ -o $@ -c $^
+	${CXX} ${CXXFLAGS} -I${PREFIX}/include -o $@ -c $^
 
 %.o : %.cc %.hh
-	${CXX} ${CXXFLAGS} -I${HOME}/local/include/ -I/usr/local/include -o $@ -c $<
+	${CXX} ${CXXFLAGS} -I${PREFIX}/include -o $@ -c $<
+
+%.o : %.cc
+	${CXX} ${CXXFLAGS} -I${PREFIX}/include -o $@ -c $<
 
 clean:
 	rm -vf *.o \