second instance for testing keysync
authorVolker Birk <vb@pep.foundation>
Mon, 29 Aug 2016 14:43:13 +0200
branchkeysync
changeset 1089cb0d8fc6dfde
parent 1088 f90f74a12d49
child 1090 c15ef7d00170
second instance for testing
Makefile.conf
src/Makefile
src/platform_unix.c
     1.1 --- a/Makefile.conf	Mon Aug 29 13:22:58 2016 +0200
     1.2 +++ b/Makefile.conf	Mon Aug 29 14:43:13 2016 +0200
     1.3 @@ -18,3 +18,9 @@
     1.4  # DEFAULT_KEYSERVER - string with default keyserver
     1.5  # CRASHDUMP_DEFAULT_LINES - number of log lines to deliver for crashdumps
     1.6  
     1.7 +#EXTRAMACROS=-DDEFAULT_KEYSERVER=\"default-server.org\" -DCRASHDUMP_DEFAULT_LINES=23
     1.8 +
     1.9 +# second instance for testing
    1.10 +
    1.11 +EXTRAMACROS=-DLOCAL_DB_FILENAME=\".pEp_management2.db\"
    1.12 +TARGET=libpEpEngine2.dylib 
     2.1 --- a/src/Makefile	Mon Aug 29 13:22:58 2016 +0200
     2.2 +++ b/src/Makefile	Mon Aug 29 14:43:13 2016 +0200
     2.3 @@ -5,14 +5,14 @@
     2.4  ifeq ($(BUILD_ON),Darwin)
     2.5  ifeq ($(BUILD_FOR),Darwin)
     2.6  
     2.7 -TARGET=libpEpEngine.dylib
     2.8 +TARGET?=libpEpEngine.dylib
     2.9  MACOSX_VERSION_MIN=10.6
    2.10  GPGME_IN=$(HOME)
    2.11  LIBGPGME=libgpgme-pthread.dylib
    2.12  CC?=clang -std=c99 -pthread
    2.13  LD?=clang
    2.14  CFLAGS?=-I$(GPGME_IN)/include -I$(HOME)/include -I/opt/local/include $(OPTIMIZE) -pedantic \
    2.15 -	-DSYSTEM_DB=\"$(SYSTEM_DB)\" -DLIBGPGME=\"$(LIBGPGME)\" -I../asn.1
    2.16 +	-DSYSTEM_DB=\"$(SYSTEM_DB)\" -DLIBGPGME=\"$(LIBGPGME)\" -I../asn.1 $(EXTRAMACROS)
    2.17  LDFLAGS?=-lc -shared -arch x86_64 \
    2.18  	-L$(HOME)/lib -L/usr/lib -L/opt/local/lib -letpan -lsqlite3 -L../asn.1 -lasn1 -lz -liconv
    2.19  
    2.20 @@ -29,7 +29,7 @@
    2.21  CC=gcc -std=c99
    2.22  CFLAGS?=-I$(GPGME_IN)/include $(OPTIMIZE) -fPIC -pedantic \
    2.23  	-DSYSTEM_DB=\"$(SYSTEM_DB)\" -DLIBGPGME=\"$(LIBGPGME)\" \
    2.24 -	-DSQLITE_THREADSAFE=1 -D_GNU_SOURCE -I../asn.1
    2.25 +	-DSQLITE_THREADSAFE=1 -D_GNU_SOURCE -I../asn.1 $(EXTRAMACROS)
    2.26  LDFLAGS?=-L$(GPGME_IN)/lib -shared -lc -ldl -letpan -lpthread -L../asn.1 -lasn1
    2.27  
    2.28  else
     3.1 --- a/src/platform_unix.c	Mon Aug 29 13:22:58 2016 +0200
     3.2 +++ b/src/platform_unix.c	Mon Aug 29 14:43:13 2016 +0200
     3.3 @@ -11,7 +11,9 @@
     3.4  #include "platform_unix.h"
     3.5  
     3.6  #define MAX_PATH 1024
     3.7 +#ifndef LOCAL_DB_FILENAME
     3.8  #define LOCAL_DB_FILENAME ".pEp_management.db"
     3.9 +#endif
    3.10  #define SYSTEM_DB_FILENAME "system.db"
    3.11  
    3.12  #ifndef bool