merge from default ENGINE-174
authorKrista Grothoff <krista@pep-project.org>
Thu, 09 Mar 2017 12:41:34 +0100
branchENGINE-174
changeset 16374078d6ed8b3b
parent 1619 c29c5805986c
parent 1621 1c8171f2196a
child 1649 a06807cad94d
merge from default
     1.1 --- a/src/Makefile	Fri Mar 03 18:48:13 2017 +0100
     1.2 +++ b/src/Makefile	Thu Mar 09 12:41:34 2017 +0100
     1.3 @@ -30,7 +30,7 @@
     1.4  CFLAGS?=-I$(GPGME_IN)/include $(OPTIMIZE) -fPIC -pedantic \
     1.5  	-DSYSTEM_DB=\"$(SYSTEM_DB)\" -DLIBGPGME=\"$(LIBGPGME)\" \
     1.6  	-DSQLITE_THREADSAFE=1 -D_GNU_SOURCE -I../asn.1 $(EXTRAMACROS)
     1.7 -LDFLAGS?=-L$(GPGME_IN)/lib -shared -lc -ldl -letpan -lpthread -L../asn.1 -lasn1
     1.8 +LDFLAGS?=-L$(GPGME_IN)/lib -shared -lc -ldl -letpan -lpthread -L../asn.1 -lasn1 -luuid
     1.9  
    1.10  else
    1.11  $(error don't know how to make for $(BUILD_FOR) on $(BUILD_ON))