Mercurial > hg > batmud > maputils

changeset 2658:c4fafcc43d83

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move some dependency checks from Makefile to config.mak for consistency.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 02 Mar 2024 16:14:37 +0200
parents 10e7931520ae
children b05a75d273bd
files Makefile config.mak
diffstat 2 files changed, 13 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sat Mar 02 15:49:23 2024 +0200
+++ b/Makefile	Sat Mar 02 16:14:37 2024 +0200
@@ -19,21 +19,6 @@
 
 
 ###
-### Detect various libraries etc
-###
-HAVE_LIBPNG ?= $(shell pkg-config --atleast-version=1.2 libpng && echo "yes")
-LIBPNG_CFLAGS ?= $(shell pkg-config --cflags libpng)
-LIBPNG_LDFLAGS ?= $(shell pkg-config --libs libpng)
-
-HAVE_LIBWEBSOCKETS ?= $(shell pkg-config --atleast-version=2 libwebsockets && echo "yes")
-LIBWEBSOCKETS_CFLAGS ?= $(shell pkg-config --cflags libwebsockets)
-LIBWEBSOCKETS_LDFLAGS ?= $(shell pkg-config --libs libwebsockets)
-
-CFLAGS += $(shell pkg-config --atleast-version=2.2 libwebsockets && echo "-DHAVE_LIBWEBSOCKETS22=1")
-CFLAGS += $(shell pkg-config --atleast-version=3.2 libwebsockets && echo "-DHAVE_LIBWEBSOCKETS32=1")
-
-
-###
 ### Static compilation for mapsearch
 ###
 ifdef STATIC
--- a/config.mak	Sat Mar 02 15:49:23 2024 +0200
+++ b/config.mak	Sat Mar 02 16:14:37 2024 +0200
@@ -30,6 +30,7 @@
 ###
 ### Detect things
 ###
+
 HAVE_CURL ?= $(shell curl --version > /dev/null 2>&1 && echo "yes")
 HAVE_WGET ?= $(shell wget --version > /dev/null 2>&1 && echo "yes")
 HAVE_PHP ?= $(shell php --version > /dev/null 2>&1 && echo "yes")
@@ -40,6 +41,18 @@
 #HTTPGET ?= wget -O
 
 
+HAVE_LIBPNG ?= $(shell pkg-config --atleast-version=1.2 libpng && echo "yes")
+LIBPNG_CFLAGS ?= $(shell pkg-config --cflags libpng)
+LIBPNG_LDFLAGS ?= $(shell pkg-config --libs libpng)
+
+HAVE_LIBWEBSOCKETS ?= $(shell pkg-config --atleast-version=2 libwebsockets && echo "yes")
+LIBWEBSOCKETS_CFLAGS ?= $(shell pkg-config --cflags libwebsockets)
+LIBWEBSOCKETS_LDFLAGS ?= $(shell pkg-config --libs libwebsockets)
+
+CFLAGS += $(shell pkg-config --atleast-version=2.2 libwebsockets && echo "-DHAVE_LIBWEBSOCKETS22=1")
+CFLAGS += $(shell pkg-config --atleast-version=3.2 libwebsockets && echo "-DHAVE_LIBWEBSOCKETS32=1")
+
+
 ###
 ### Misc stuff
 ###