From dd72e4d0f5b5485f9e9ada1122fdaaf27b934350 Mon Sep 17 00:00:00 2001 From: Vincent Siliakus Date: Sat, 8 Feb 2014 14:47:21 +0100 Subject: [PATCH] Added small check to Makefile in order to make markdown useable as dependency in other projects. --- Makefile | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 2bf6bf1..dc1aa81 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,23 @@ MIX = mix ERLANG_PATH = $(shell erl -eval 'io:format("~s", [lists:concat([code:root_dir(), "/erts-", erlang:system_info(version), "/include"])])' -s init stop -noshell) -CFLAGS = -g -O3 -ansi -pedantic -Wall -Wextra -Wno-unused-parameter -Ideps/hoedown/src -I$(ERLANG_PATH) + +ifeq (, $(shell find . -name deps)) + HOEDOWN_PATH = ../hoedown +else + HOEDOWN_PATH = deps/hoedown +endif + +CFLAGS = -g -O3 -ansi -pedantic -Wall -Wextra -Wno-unused-parameter -I$(HOEDOWN_PATH)/src -I$(ERLANG_PATH) HOEDOWN_OBJS=\ - deps/hoedown/src/html.o \ - deps/hoedown/src/html_smartypants.o \ - deps/hoedown/src/html_blocks.o \ - deps/hoedown/src/buffer.o \ - deps/hoedown/src/autolink.o \ - deps/hoedown/src/stack.o \ - deps/hoedown/src/escape.o \ - deps/hoedown/src/markdown.o + $(HOEDOWN_PATH)/src/html.o \ + $(HOEDOWN_PATH)/src/html_smartypants.o \ + $(HOEDOWN_PATH)/src/html_blocks.o \ + $(HOEDOWN_PATH)/src/buffer.o \ + $(HOEDOWN_PATH)/src/autolink.o \ + $(HOEDOWN_PATH)/src/stack.o \ + $(HOEDOWN_PATH)/src/escape.o \ + $(HOEDOWN_PATH)/src/markdown.o ifneq ($(OS),Windows_NT) CFLAGS += -fPIC @@ -28,11 +35,10 @@ markdown: $(MIX) compile priv/markdown.so: src/markdown.c - $(MAKE) -C deps/hoedown libhoedown.a + $(MAKE) -C $(HOEDOWN_PATH) $(CC) $(CFLAGS) -shared $(LDFLAGS) -o $@ $(HOEDOWN_OBJS) src/markdown.c clean: $(MIX) clean - $(MAKE) -C deps/hoedown clean - $(RM) deps/hoedown/libhoedown.a + $(MAKE) -C $(HOEDOWN_PATH) clean $(RM) priv/markdown.so