ENGINE-864: some cleanup

Makefile.conf

@@ -175,6 +175,8 @@ endif
 
 # The flag -DNDEBUG will always be removed from CXXFLAGS for compiling tests.
 # The tests do not work properly, if compiled with -DNDEBUG
+# FIXME: -D flags traditionally go in CPPFLAGS, as they're preprocessor defines. We need to clean
+# this up in the whole build system.
 ifeq ($(BUILD_FOR),Linux)
     CXXFLAGS+=-fdiagnostics-color=auto -I../src -I../asn.1 $(ETPAN_INC)
     ifdef WARN
@@ -208,7 +210,7 @@ endif
 ######### C and C++ #########
 ifeq ($(BUILD_FOR),Darwin)
     CPPFLAGS+=-D_DARWIN_C_SOURCE
-    CXXFLAGS+=-D_DARWIN_C_SOURCE
+    LDLIBS+=-liconv
 else
     LDLIBS+=-luuid
 endif
@@ -305,7 +307,6 @@ ifndef PEP_MIME_SRC
     $(error "Compiling with the PEP_MIME option set requires the value of PEP_MIME_SRC to be set to the source directory for libpEpMIME")
 else
     CPPFLAGS+=-DPEP_BUILTIN_MIME
-    CXXFLAGS+=-DPEP_BUILTIN_MIME
     LDLIBS+=-lstdc++
     ETPAN_LIB=
     ETPAN_INC=

pEpMIME/Makefile

@@ -70,10 +70,10 @@ libpEpMIME.a: $(LIB_OBJ)
 	${AR} rcs $@ $^
 
 %.o : %.cc %.hh
-	${CXX} ${CXXFLAGS} -I${PREFIX}/include -o $@ -c $<
+	${CXX} ${CXXFLAGS} ${CPPFLAGS} -I${PREFIX}/include -o $@ -c $<
 
 %.o : %.cc
-	${CXX} ${CXXFLAGS} -I${PREFIX}/include -o $@ -c $<
+	${CXX} ${CXXFLAGS} ${CPPFLAGS} -I${PREFIX}/include -o $@ -c $<
 
 clean:
 	rm -vf *.o *.a