Converted .hgignore to .gitignore

.gitignore

@@ -1,14 +1,12 @@
-syntax: regexp
-^asn\.1/.*\.(c|h)$
-^asn\.1/libasn1\.a$
-.*xcuserdata/
-^build/
-^local.conf
-^test_home/
-
-syntax: glob
 asn.1/Makefile.am.*
 asn.1/converter-example.mk
+asn.1/libasn1.a
+local.conf
+build/
+test_home/
+asn.1/*.c
+asn.1/*.h
+xcuserdata/
 *.orig
 *.old
 *.d

Makefile.conf

@@ -200,6 +200,24 @@ ASN1C_INC=
 #ASN1C_INC=-I$(HOME)/include
 
 
+#########   MIME   #########
+# Must be either ETPAN or PEPMIME.
+# N.B. PEPMIME is currently experimental.
+#
+MIME_LIBRARY=ETPAN
+#MIME_LIBRARY=PEPMIME
+ 
+ 
+######### pEp MIME #########
+# pEp MIME library search flag
+#
+PEP_MIME_LIB=
+#PEP_MIME_LIB=-L$(HOME)/pEp/lib
+
+# pEp MIME include search flag
+PEP_MIME_INC=
+#PEP_MIME_INC=-I$(HOME)/pEp/include
+
 ######### libetpan #########
 # libetpan library search flag
 ETPAN_LIB=
@@ -209,17 +227,6 @@ ETPAN_LIB=
 ETPAN_INC=
 #ETPAN_INC=-I$(HOME)/include
 
-
-######### pEp MIME #########
-# set this to skip libetpan and use PEP_MIME instead
-# PEP_MIME=1
-#
-# pEp MIME library search flag
-PEP_MIME_LIB=
-# pEp MIME include search flag
-PEP_MIME_INC=
-
-
 ######### sqlite3 #########
 # If empty (or undefined), compile sqlite3 from the sources shipped with the pEp distribution.
 # Otherwise, use an sqlite3 implementation found in the OS's include/library paths.

src/Makefile

@@ -18,13 +18,6 @@ LDFLAGS+= $(ETPAN_LIB) $(PEP_MIME_LIB) -L../asn.1 -shared
 LDLIBS+= -lc -lasn1
 NO_SOURCE=
 
-ifndef PEP_MIME
-LDLIBS+= -letpan
-else
-LDLIBS+= -lpEpMIME
-NO_SOURCE+= etpan_mime.c
-endif
-
 ifeq ($(BUILD_ON),Darwin)
     ifeq ($(BUILD_FOR),Darwin)
         CFLAGS+= -DSQLITE_THREADSAFE=1
@@ -57,6 +50,19 @@ else
     $(error Unknown OpenPGP library: $(OPENPGP))
 endif
 
+ifeq ($(MIME_LIBRARY),ETPAN)
+    CFLAGS+= -DUSE_ETPAN $(ETPAN_INC)
+    LDFLAGS+= $(ETPAN_LIB)
+    LDLIBS+= -letpan
+else ifeq ($(MIME_LIBRARY),PEP_MIME)
+    CFLAGS+= -DUSE_PEPMIME $(PEP_MIME_INC)
+    LDFLAGS+= $(PEP_MIME_LIB)
+    LDLIBS+= -lpEpMIME
+    NO_SOURCE+= etpan_mime.c
+else
+    $(error Unknown MIME library: $(MIME_LIBRARY))
+endif
+
 ALL_SOURCE=$(filter-out $(NO_SOURCE),$(wildcard *.c))
 DEPENDS=$(subst .c,.d,$(ALL_SOURCE))
 ALL_OBJECTS=$(subst .c,.o,$(ALL_SOURCE))