merging
authorVolker Birk <vb@pep-project.org>
Mon, 06 Jun 2016 17:37:23 +0200
changeset 7174307c2cf21d4
parent 716 498156bf9993
parent 715 55d0d8b397e9
child 718 be6282073b98
merging
src/Makefile
     1.1 --- a/Makefile.conf	Mon Jun 06 17:35:13 2016 +0200
     1.2 +++ b/Makefile.conf	Mon Jun 06 17:37:23 2016 +0200
     1.3 @@ -1,6 +1,6 @@
     1.4  BUILD_ON=$(shell uname)
     1.5  BUILD_FOR=$(BUILD_ON)
     1.6 -OPTIMIZE=-g -O0
     1.7 +OPTIMIZE=-g -O0 -fPIC
     1.8  #OPTIMIZE=-O3 -DNDEBUG -std=c99
     1.9  LD=$(CC)
    1.10  #CC=gcc-mp-4.9 -std=c99 -fstrict-aliasing -Wstrict-aliasing=3
    1.11 @@ -11,6 +11,9 @@
    1.12  YML_PATH=$(HOME)/yml2
    1.13  ASN1C=asn1c
    1.14  
    1.15 +# TODO: For brew this is /usr/local/share/asn1c
    1.16 +# On BSDs, it might be that as well. How to check?
    1.17 +# For now, it just works, even when it doesn't exist.
    1.18  ASN1C_INCLUDE=/opt/local/share/asn1c
    1.19  
    1.20  # C makros (not environment variables) to overwrite:
     2.1 --- a/src/Makefile	Mon Jun 06 17:35:13 2016 +0200
     2.2 +++ b/src/Makefile	Mon Jun 06 17:37:23 2016 +0200
     2.3 @@ -29,8 +29,8 @@
     2.4  CC=gcc -std=c99
     2.5  CFLAGS?=-I$(GPGME_IN)/include $(OPTIMIZE) -fPIC -pedantic \
     2.6  	-DSYSTEM_DB=\"$(SYSTEM_DB)\" -DLIBGPGME=\"$(LIBGPGME)\" \
     2.7 -	-DSQLITE_THREADSAFE=1 -D_GNU_SOURCE -I../asn.1
     2.8 -LDFLAGS?=-L$(GPGME_IN)/lib -shared -lc -ldl -letpan -lsqlite3 -lpthread -L../asn.1 -lasn1
     2.9 +	-DSQLITE_THREADSAFE=1 -D_GNU_SOURCE -I../asn.1 -lsqlite3
    2.10 +LDFLAGS?=-L$(GPGME_IN)/lib -shared -lc -ldl -letpan -lpthread -L../asn.1 -lasn1
    2.11  
    2.12  else
    2.13  $(error don't know how to make for $(BUILD_FOR) on $(BUILD_ON))