Kludged Makefiles that actually work with pEpMIME (with a modified branch), but aren't yet what we want. Was just to get it to run.

.gitignore

@@ -86,6 +86,7 @@ lldb-history
 test/EngineTests
 test/googletest
 test/tmp/*
+.idea/
 
 # ignore generated test data
 

Makefile

@@ -19,23 +19,23 @@ ifdef BUILD_CONFIG
     $(info ================================================)
 endif
 
-.PHONY: all sync asn1 build install dbinstall uninstall clean tags test package db
+.PHONY: all pepmime sync asn1 build install dbinstall uninstall clean tags test package db
 
-build: asn1 pepmime
+build: pepmime asn1
 	$(MAKE) -C src
 
 all: build
 # `make all` is not for tests, that's what `make test` is for
 #	$(MAKE) -C test
 
+pepmime:
+	$(MAKE) -C pEpMIME lib
 sync:
 	$(MAKE) -C sync
 
 asn1: sync
 	$(MAKE) -C asn.1
 
-pepmime:
-	$(MAKE) -C pEpMIME lib
 
 install: build
 	$(MAKE) -C src install

Makefile.conf

@@ -176,6 +176,7 @@ endif
 ######### C and C++ #########
 ifeq ($(BUILD_FOR),Darwin)
     CPPFLAGS=-D_DARWIN_C_SOURCE
+    CXXFLAGS=-D_DARWIN_C_SOURCE
 else
     CPPFLAGS=
 endif
@@ -202,6 +203,9 @@ ASN1C_INC=
 ######### pEp MIME #########
 PEP_MIME = 1
 PEP_MIME_SRC=$(HOME)/src/pEpMIME/src
+CPPFLAGS=-DPEP_BUILTIN_MIME
+CXXFLAGS=-DPEP_BUILTIN_MIME
+LDLIBS+=-lstdc++
 
 
 ######### libetpan #########

test/Makefile

@@ -34,7 +34,13 @@ else ifeq ($(OPENPGP),NETPGP)
     LDFLAGS+= $(NETGPG_LIB)
 endif
 
-LDLIBS+= -letpan -lpEpEngine -lstdc++ -lasn1
+ifdef PEP_MIME
+LDLIBS+= -lpEpMIME -liconv
+else
+LDLIBS_= -letpan
+endif
+
+LDLIBS+= -lpEpEngine -lstdc++ -lasn1
 
 ifeq ($(BUILD_FOR),Linux)
     LDLIBS+= -luuid
@@ -72,9 +78,12 @@ else ifeq ($(OPENPGP),NETPGP)
 endif
 
 EXTRA_LIB_PATHS=.:../src:
+ifndef PEP_MIME
 ifdef ETPAN_LIB
     EXTRA_LIB_PATHS:=$(EXTRA_LIB_PATHS)$(patsubst -L%,%,$(ETPAN_LIB)):
 endif
+endif
+
 ifdef GPGME_LIB
     EXTRA_LIB_PATHS:=$(EXTRA_LIB_PATHS)$(patsubst -L%,%,$(GPGME_LIB)):
 endif