merged in default, plus fixing Makefile merge
authorKrista Grothoff <krista@pep-project.org>
Mon, 13 Mar 2017 22:39:57 +0100
changeset 1665bf5c8d3fb0d2
parent 1661 f0e19e88cf97
child 1666 01779e4c5940
merged in default, plus fixing Makefile merge
src/Makefile
     1.1 --- a/src/Makefile	Mon Mar 13 21:40:47 2017 +0100
     1.2 +++ b/src/Makefile	Mon Mar 13 22:39:57 2017 +0100
     1.3 @@ -12,7 +12,7 @@
     1.4  CC?=clang -std=c99 -pthread
     1.5  LD?=clang
     1.6  CFLAGS?=-I$(GPGME_IN)/include -I$(HOME)/include -I/opt/local/include $(OPTIMIZE) -pedantic \
     1.7 -	-DSYSTEM_DB=\"$(SYSTEM_DB)\" -DLIBGPGME=\"$(LIBGPGME)\" -I../asn.1 $(EXTRAMACROS)
     1.8 +	-DSYSTEM_DB=\"$(SYSTEM_DB)\" -DLIBGPGME=\"$(LIBGPGME)\" -DNDEBUG -I../asn.1 $(EXTRAMACROS)
     1.9  LDFLAGS?=-lc -shared -arch x86_64 \
    1.10  	-L$(HOME)/lib -L/usr/lib -L/opt/local/lib -letpan -lsqlite3 -L../asn.1 -lasn1 -lz -liconv
    1.11  
    1.12 @@ -29,7 +29,7 @@
    1.13  CC=gcc -std=c99
    1.14  CFLAGS?=-I$(GPGME_IN)/include $(OPTIMIZE) -fPIC -pedantic \
    1.15  	-DSYSTEM_DB=\"$(SYSTEM_DB)\" -DLIBGPGME=\"$(LIBGPGME)\" \
    1.16 -	-DSQLITE_THREADSAFE=1 -D_GNU_SOURCE -I../asn.1 $(EXTRAMACROS)
    1.17 +	-DSQLITE_THREADSAFE=1 -D_GNU_SOURCE -DNDEBUG -I../asn.1 $(EXTRAMACROS)
    1.18  LDFLAGS?=-L$(GPGME_IN)/lib -shared -lc -ldl -letpan -lpthread -L../asn.1 -lasn1 -luuid
    1.19  
    1.20  else