From cdc3d601bfe1f16ea96f35526644eaf53415be80 Mon Sep 17 00:00:00 2001 From: Tor Andersson <tor.andersson@artifex.com> Date: Mon, 11 Nov 2013 14:59:21 +0100 Subject: Remove unneccessary CURL_CFLAGS from non-curl make targets. --- Makefile | 2 +- Makerules | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7004eef3..dbe9936f 100644 --- a/Makefile +++ b/Makefile @@ -143,7 +143,7 @@ $(OUT)/%.o : scripts/%.c | $(OUT) $(CC_CMD) $(OUT)/platform/x11/%.o : platform/x11/%.c | $(ALL_DIR) - $(CC_CMD) $(X11_CFLAGS) $(CURL_CFLAGS) + $(CC_CMD) $(X11_CFLAGS) $(OUT)/platform/x11/curl/%.o : platform/x11/%.c | $(ALL_DIR) $(CC_CMD) $(X11_CFLAGS) $(CURL_CFLAGS) -DHAVE_CURL diff --git a/Makerules b/Makerules index 6f7b3f28..e52571ec 100644 --- a/Makerules +++ b/Makerules @@ -59,6 +59,7 @@ SYS_OPENSSL_CFLAGS = -DHAVE_OPENSSL $(shell pkg-config --cflags libcrypto) SYS_OPENSSL_LIBS = $(shell pkg-config --libs libcrypto) endif +# TODO: use pkg-config for system CURL SYS_CURL_DEPS = -lpthread -lrt SYS_X11_CFLAGS = $(shell pkg-config --cflags x11 xext) -- cgit v1.2.3