add the changes for my local paths into a separate branch roker-linux
authorRoker <roker@pep-project.org>
Thu, 23 Jun 2016 16:04:29 +0200
branchroker-linux
changeset 7589679c776ff5e
parent 757 667fbb1ee478
child 760 36d65f41170c
add the changes for my local paths into a separate branch
Makefile.conf
src/Makefile
test/Makefile
     1.1 --- a/Makefile.conf	Thu Jun 23 10:44:29 2016 +0200
     1.2 +++ b/Makefile.conf	Thu Jun 23 16:04:29 2016 +0200
     1.3 @@ -1,20 +1,20 @@
     1.4  BUILD_ON=$(shell uname)
     1.5  BUILD_FOR=$(BUILD_ON)
     1.6 -OPTIMIZE=-g -O0 -fPIC
     1.7 +OPTIMIZE=-g -O0 -Wall -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  #LD=gcc-mp-4.9
    1.12 -SYSTEM_DB=/usr/local/share/pEp/system.db
    1.13 -PREFIX=$(HOME)
    1.14 -YML2PROC=$(HOME)/yml2/yml2proc
    1.15 -YML_PATH=$(HOME)/yml2
    1.16 -ASN1C=asn1c
    1.17 +SYSTEM_DB=/home/deb/local/share/pEp/system.db
    1.18 +PREFIX=$(HOME)/local
    1.19 +YML2PROC=$(HOME)/something/yml2/yml2proc
    1.20 +YML_PATH=$(HOME)/something/yml2
    1.21 +ASN1C=/home/deb/local/bin/asn1c
    1.22  
    1.23  # TODO: For brew this is /usr/local/share/asn1c
    1.24  # On BSDs, it might be that as well. How to check?
    1.25  # For now, it just works, even when it doesn't exist.
    1.26 -ASN1C_INCLUDE=/opt/local/share/asn1c
    1.27 +ASN1C_INCLUDE=/usr/local/share/asn1c
    1.28  
    1.29  # C makros (not environment variables) to overwrite:
    1.30  #
     2.1 --- a/src/Makefile	Thu Jun 23 10:44:29 2016 +0200
     2.2 +++ b/src/Makefile	Thu Jun 23 16:04:29 2016 +0200
     2.3 @@ -7,14 +7,14 @@
     2.4  
     2.5  TARGET=libpEpEngine.dylib
     2.6  MACOSX_VERSION_MIN=10.6
     2.7 -GPGME_IN=$(HOME)
     2.8 +GPGME_IN=$(HOME)/local
     2.9  LIBGPGME=libgpgme-pthread.dylib
    2.10  CC?=clang -std=c99 -pthread
    2.11  LD?=clang
    2.12 -CFLAGS?=-I$(GPGME_IN)/include -I$(HOME)/include -I/opt/local/include $(OPTIMIZE) -pedantic \
    2.13 +CFLAGS?=-I$(GPGME_IN)/include -I$(HOME)/local/include -I/opt/local/include $(OPTIMIZE) -pedantic \
    2.14  	-DSYSTEM_DB=\"$(SYSTEM_DB)\" -DLIBGPGME=\"$(LIBGPGME)\" -I../asn.1
    2.15  LDFLAGS?=-lc -shared -arch x86_64 \
    2.16 -	-L$(HOME)/lib -L/opt/local/lib -letpan -lsqlite3 -L../asn.1 -lasn1
    2.17 +	-L$(HOME)/local/lib -L/opt/local/lib -letpan -lsqlite3 -L../asn.1 -lasn1
    2.18  
    2.19  else
    2.20  $(error don't know how to make for $(BUILD_FOR) on $(BUILD_ON))
    2.21 @@ -24,7 +24,7 @@
    2.22  ifeq ($(BUILD_FOR),Linux)
    2.23  
    2.24  TARGET=libpEpEngine.so
    2.25 -GPGME_IN=$(HOME)
    2.26 +GPGME_IN=$(HOME)/local
    2.27  LIBGPGME=libgpgme.so.11
    2.28  CC=gcc -std=c99
    2.29  CFLAGS?=-I$(GPGME_IN)/include $(OPTIMIZE) -fPIC -pedantic \
     3.1 --- a/test/Makefile	Thu Jun 23 10:44:29 2016 +0200
     3.2 +++ b/test/Makefile	Thu Jun 23 16:04:29 2016 +0200
     3.3 @@ -3,7 +3,7 @@
     3.4  CC?=g++ -std=gnu++11 -pthread
     3.5  CXX?=g++ -std=gnu++11 -pthread
     3.6  LD?=$(CXX)
     3.7 -LDFLAGS?=-L$(HOME)/lib
     3.8 +LDFLAGS?=-L$(HOME)/local/lib
     3.9  LDLIBS?=-letpan -lpEpEngine -lstdc++ -L../asn.1 -lasn1
    3.10  CXXFLAGS?=-g -O0 -I../src -I../asn.1
    3.11  # CXXFLAGS=-O3 -DNDEBUG
    3.12 @@ -27,10 +27,10 @@
    3.13  	rm -Rf *.dSYM
    3.14  
    3.15  test: pEpEngineTest
    3.16 -	LD_LIBRARY_PATH=~/lib:../src ./pEpEngineTest
    3.17 +	LD_LIBRARY_PATH=~/local/lib:../src ./pEpEngineTest
    3.18  
    3.19  %_test_run : %_test
    3.20 -	LD_LIBRARY_PATH=~/lib:../src ./$<
    3.21 +	LD_LIBRARY_PATH=~/local/lib:../src ./$<
    3.22  
    3.23  %_test_lldb : %_test
    3.24  	LD_LIBRARY_PATH=~/lib:../src lldb ./$<