Browse Source

change Makefile again for Seq 1.7.0 and to remove wrong deployment info

master
Volker Birk 7 months ago
parent
commit
221908b41a
2 changed files with 5 additions and 5 deletions
  1. +4
    -4
      Makefile.conf
  2. +1
    -1
      src/Makefile

+ 4
- 4
Makefile.conf View File

@ -339,16 +339,16 @@ endif
# Otherwise, add them to the CFLAGS/CXXFLAGS/LDFLAGS and library/include variables
ifeq ($(OPENPGP),SEQUOIA)
ifeq ($(SEQUOIA_CFLAGS),)
SEQUOIA_CFLAGS+=$(shell pkg-config --cflags-only-other sequoia-openpgp) -O2
SEQUOIA_CFLAGS+=$(shell pkg-config --cflags-only-other sequoia) -O2
endif
ifeq ($(SEQUOIA_LDFLAGS),)
SEQUOIA_LDFLAGS+=$(shell pkg-config --libs-only-L sequoia-openpgp)
SEQUOIA_LDFLAGS+=$(shell pkg-config --libs-only-L sequoia)
endif
ifeq ($(SEQUOIA_LIB),)
SEQUOIA_LIB=$(shell pkg-config --libs-only-l --libs-only-other sequoia-openpgp)
SEQUOIA_LIB=$(shell pkg-config --libs-only-l --libs-only-other sequoia)
endif
ifeq ($(SEQUOIA_INC),)
SEQUOIA_INC=$(shell pkg-config --cflags-only-I sequoia-openpgp)
SEQUOIA_INC=$(shell pkg-config --cflags-only-I sequoia)
endif
CFLAGS+= $(SEQUOIA_CFLAGS)
CXXFLAGS+= $(SEQUOIA_CFLAGS)


+ 1
- 1
src/Makefile View File

@ -37,7 +37,7 @@ ifeq ($(BUILD_ON),OS/390)
LDLIBS+= -lzz
else ifeq ($(BUILD_ON),Darwin)
ifeq ($(BUILD_FOR),Darwin)
LDLIBS+= -lz -liconv -mmacosx-version-min=10.10
LDLIBS+= -lz -liconv
else
$(error I do not know how to make for $(BUILD_FOR) on $(BUILD_ON))
endif


Loading…
Cancel
Save