From 3966550ae8198eef2050c24d87dd7a89d1410ded Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Tue, 7 Mar 2017 15:40:09 +0100 Subject: Only include pthread library when needed. Rename HAVE_PTHREADS to HAVE_PTHREAD to match naming of other defines, where the macro is named after the library that is linked. --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 8b423144..787f34d9 100644 --- a/Makefile +++ b/Makefile @@ -191,6 +191,9 @@ $(OUT)/%.o : source/%.c | $(ALL_DIR) $(OUT)/%.o : source/%.cpp | $(ALL_DIR) $(CXX_CMD) +$(OUT)/helpers/%.o : source/helpers/%.c | $(ALL_DIR) + $(CC_CMD) $(PTHREAD_CFLAGS) -DHAVE_PTHREAD + $(OUT)/%.o : scripts/%.c | $(OUT) $(CC_CMD) @@ -275,13 +278,13 @@ $(MUTOOL_OBJ): $(FITZ_HDR) $(PDF_HDR) MUTOOL_LIB = $(OUT)/libmutools.a $(MUTOOL_LIB) : $(MUTOOL_OBJ) $(MUTOOL) : $(MUTOOL_LIB) $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB) - $(LINK_CMD) + $(LINK_CMD) $(PTHREAD_LIBS) MURASTER := $(OUT)/muraster MURASTER_OBJ := $(addprefix $(OUT)/tools/, muraster.o) $(MURASTER_OBJ): $(FITZ_HDR) $(MURASTER) : $(MURASTER_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB) - $(LINK_CMD) + $(LINK_CMD) $(PTHREAD_LIBS) MJSGEN := $(OUT)/mjsgen MJSGEN_OBJ := $(addprefix $(OUT)/tools/, mjsgen.o) -- cgit v1.2.3