merged in default ENGINE-233
authorKrista Bennett <krista@pep-project.org>
Mon, 28 Aug 2017 15:52:45 +0200
branchENGINE-233
changeset 20133ef02ca70fec
parent 2012 a1a5e174d3cd
child 2017 cb9212af4a8c
merged in default
src/Makefile
test/Makefile
     1.1 --- a/src/Makefile	Mon Aug 28 15:51:39 2017 +0200
     1.2 +++ b/src/Makefile	Mon Aug 28 15:52:45 2017 +0200
     1.3 @@ -5,16 +5,15 @@
     1.4  
     1.5  include ../Makefile.conf
     1.6  
     1.7 -CFLAGS+= -g $(ETPAN_INC) -I../asn.1 -DSYSTEM_DB=\"$(SYSTEM_DB)\" $(EXTRA_MACROS)
     1.8 +CFLAGS+= $(ETPAN_INC) -I../asn.1 -DSYSTEM_DB=\"$(SYSTEM_DB)\" $(EXTRA_MACROS)
     1.9  LDFLAGS+= $(ETPAN_LIB) -L../asn.1 -shared
    1.10 -LDLIBS+= -lc -letpan -lasn1 -lsqlite3
    1.11 +LDLIBS+= -lc -letpan -lasn1
    1.12  NO_SOURCE=
    1.13  
    1.14  ifeq ($(BUILD_ON),Darwin)
    1.15      ifeq ($(BUILD_FOR),Darwin)
    1.16          CFLAGS+= -DSQLITE_THREADSAFE=1
    1.17 -        #LDFLAGS+= -L/opt/local/lib
    1.18 -        LDLIBS+= -lsqlite3 -lz -liconv
    1.19 +        LDLIBS+= -lz -liconv
    1.20      else
    1.21          $(error I don't know how to make for $(BUILD_FOR) on $(BUILD_ON))
    1.22      endif
    1.23 @@ -32,6 +31,7 @@
    1.24  ifdef SQLITE3_FROM_OS
    1.25      NO_SOURCE+= sqlite3.c
    1.26      CFLAGS+= -DSQLITE3_FROM_OS
    1.27 +    LDLIBS+= -lsqlite3
    1.28  endif
    1.29  
    1.30  ifeq ($(OPENPGP),GPG)
     2.1 --- a/test/Makefile	Mon Aug 28 15:51:39 2017 +0200
     2.2 +++ b/test/Makefile	Mon Aug 28 15:52:45 2017 +0200
     2.3 @@ -14,7 +14,7 @@
     2.4  TEST_GNUPGHOME=$(TEST_HOME)/.gnupg
     2.5  
     2.6  LDFLAGS+= $(ETPAN_LIB) -L../asn.1 -L../src
     2.7 -LDLIBS+= -letpan -lpEpEngine -lstdc++ -lasn1 -lsqlite3
     2.8 +LDLIBS+= -letpan -lpEpEngine -lstdc++ -lasn1
     2.9  
    2.10  ifeq ($(BUILD_FOR),Linux)
    2.11      LDLIBS+= -luuid
    2.12 @@ -24,6 +24,10 @@
    2.13      LDLIBS+= -lnetpgp
    2.14  endif
    2.15  
    2.16 +ifdef SQLITE3_FROM_OS
    2.17 +    LDLIBS+= -lsqlite3
    2.18 +endif
    2.19 +
    2.20  ifeq ($(shell uname),Darwin)
    2.21      LIBPATH=DYLD_LIBRARY_PATH
    2.22      LLDB_BIN=/Applications/Xcode.app/Contents/Developer/usr/bin/lldb