diff options
| author | Jannis Teunissen <jannis@teunissen.net> | 2019-05-09 16:23:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-09 16:23:07 +0200 |
| commit | f0062e700ecd659c434fba6372f87552b8e6a0ff (patch) | |
| tree | f936d8436792ab8ebd4ce81f83b42481c36405b3 | |
| parent | f7b3faa33e94bbd5e40dcd07980c9e82751cc659 (diff) | |
| download | purple-matrix-f0062e700ecd659c434fba6372f87552b8e6a0ff.tar.gz | |
Update Makefile according to suggestions
| -rw-r--r-- | Makefile | 16 |
1 files changed, 6 insertions, 10 deletions
@@ -5,21 +5,17 @@ LIBS=purple json-glib-1.0 glib-2.0 sqlite3 PKG_CONFIG=pkg-config -PKG_CFLAGS=$(shell $(PKG_CONFIG) --cflags $(LIBS) || echo "FAILED") +PKG_CFLAGS:=$(shell $(PKG_CONFIG) --cflags $(LIBS) || echo "FAILED") ifeq ($(PKG_CFLAGS),FAILED) -$(error "$(PKG_CONFIG) failed") -else -CFLAGS+=$(PKG_CFLAGS) + $(error "$(PKG_CONFIG) failed") endif -CFLAGS+=-fPIC -DPIC +CFLAGS+=$(PKG_CFLAGS) -fPIC -DPIC -PKG_LDLIBS=$(shell $(PKG_CONFIG) --libs $(LIBS) || echo "FAILED") +PKG_LDLIBS:=$(shell $(PKG_CONFIG) --libs $(LIBS) || echo "FAILED") ifeq ($(PKG_LDLIBS),FAILED) -$(error "$(PKG_CONFIG) failed") -else -LDLIBS+=$(PKG_LDLIBS) + $(error "$(PKG_CONFIG) failed") endif -LDLIBS+=-lhttp_parser +LDLIBS+=$(PKG_LDLIBS) -lhttp_parser ifndef MATRIX_NO_E2E LDLIBS+=-lolm -lgcrypt |