Browse Source

push before migration

mime-integrate
parent
commit
68b920cb2c
3 changed files with 37 additions and 20 deletions
  1. +5
    -1
      Makefile
  2. +22
    -13
      Makefile.conf
  3. +10
    -6
      src/Makefile

+ 5
- 1
Makefile View File

@ -21,7 +21,7 @@ endif
.PHONY: all sync asn1 build install dbinstall uninstall clean tags test package db
build: asn1
build: asn1 pepmime
$(MAKE) -C src
all: build
@ -34,9 +34,13 @@ sync:
asn1: sync
$(MAKE) -C asn.1
pepmime:
$(MAKE) -C pEpMIME lib
install: build
$(MAKE) -C src install
$(MAKE) -C asn.1 install
$(MAKE) -C pEpMIME engine_install
beinstall:
$(MAKE) -C src beinstall


+ 22
- 13
Makefile.conf View File

@ -15,7 +15,6 @@
# It is possible to use multiple variants simultaniously.
# If nothing is changed according to these 3 methods, a default configuration for your platform (specified below) will be used for the build.
######### Header #########
HERE:=$(dir $(lastword $(MAKEFILE_LIST)))
@ -200,8 +199,14 @@ ASN1C_INC=
#ASN1C_INC=-I$(HOME)/include
######### pEp MIME #########
PEP_MIME = 1
PEP_MIME_SRC=$(HOME)/src/pEpMIME/src
######### libetpan #########
# libetpan library search flag
#
ETPAN_LIB=
#ETPAN_LIB=-L$(HOME)/lib
@ -210,16 +215,6 @@ ETPAN_INC=
#ETPAN_INC=-I$(HOME)/include
######### pEp MIME #########
# set this to skip libetpan and use PEP_MIME instead
# PEP_MIME=1
#
# pEp MIME library search flag
PEP_MIME_LIB=
# pEp MIME include search flag
PEP_MIME_INC=
######### sqlite3 #########
# If empty (or undefined), compile sqlite3 from the sources shipped with the pEp distribution.
# Otherwise, use an sqlite3 implementation found in the OS's include/library paths.
@ -274,10 +269,10 @@ ifeq ($(SEQUOIA_CFLAGS),)
SEQUOIA_CFLAGS=$(shell pkg-config --cflags-only-other sequoia-openpgp)
endif
ifeq ($(SEQUOIA_LDFLAGS),)
SEQUOIA_LDFLAGS=$(shell pkg-config --libs-only-l --libs-only-other sequoia-openpgp)
SEQUOIA_LDFLAGS=$(shell pkg-config --libs-only-L --libs-only-other sequoia-openpgp)
endif
ifeq ($(SEQUOIA_LIB),)
SEQUOIA_LIB=$(shell pkg-config --libs-only-L sequoia-openpgp)
SEQUOIA_LIB=$(shell pkg-config --libs-only-l sequoia-openpgp)
endif
ifeq ($(SEQUOIA_INC),)
SEQUOIA_INC=$(shell pkg-config --cflags-only-I sequoia-openpgp)
@ -288,3 +283,17 @@ endif
# YML_PATH is needed in the environment of every call to a program of the YML2 distribution
export YML_PATH=$(YML2_PATH)
ifdef PEP_MIME
ifndef PEP_MIME_SRC
$(error "Compiling with the PEP_MIME option set requires the value of PEP_MIME_SRC to be set to the source directory for libpEpMIME")
else
$(shell mkdir -p pEpMIME)
$(shell cp $(PEP_MIME_SRC)/*.{cc,hh,hxx} $(HERE)/pEpMIME)
$(shell cp $(PEP_MIME_SRC)/Makefile $(HERE)/pEpMIME)
ETPAN_LIB=
ETPAN_INC=
endif
else
endif

+ 10
- 6
src/Makefile View File

@ -13,17 +13,21 @@ ifdef PER_MACHINE_DIRECTORY
EXTRA_MACROS+= -DPER_MACHINE_DIRECTORY=\"$(PER_MACHINE_DIRECTORY)\"
endif
CFLAGS+= $(ETPAN_INC) $(PEP_MIME_INC) -I../asn.1 $(EXTRA_MACROS)
LDFLAGS+= $(ETPAN_LIB) $(PEP_MIME_LIB) -L../asn.1 -shared
LDLIBS+= -lc -lasn1
NO_SOURCE=
ifndef PEP_MIME
LDLIBS+= -letpan
CFLAGS+= $(ETPAN_INC)
LDFLAGS+= $(ETPAN_LIB)
LDLIBS+= -letpan
else
LDLIBS+= -lpEpMIME
NO_SOURCE+= etpan_mime.c
LDFLAGS+= -L../pEpMIME -shared
LDLIBS+= -lpEpMIME
NO_SOURCE+= etpan_mime.c
endif
CFLAGS+= -I../asn.1 $(EXTRA_MACROS)
LDFLAGS+= -L../asn.1 -shared
LDLIBS+= -lc -lasn1
ifeq ($(BUILD_ON),Darwin)
ifeq ($(BUILD_FOR),Darwin)


Loading…
Cancel
Save