From 2f13e507c5069d0de3bd9fe65c1d48348d329fdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Sun, 6 Nov 2016 13:17:38 +0100
Subject: Add CPREFIX configuration and fix external build

---
 Makefile | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 3a5f87e..ea16c12 100644
--- a/Makefile
+++ b/Makefile
@@ -19,11 +19,14 @@ endif
 CFLAGS += -Wall
 CFLAGS += -Iinclude -include $(O)/build/config.h
 
+# Apply CPREFIX
+CC:=$(CPREFIX)$(CC)
+
 ### Source files list ###########################
 SRC = geml.c \
-	  utils.c \
-	  io.c \
-	  parser.c
+      args_parser.c \
+      io.c \
+      utils.c
 ### End of source files list ####################
 
 CSRC = $(patsubst %,src/%,$(filter %.c,$(SRC)))
@@ -93,7 +96,7 @@ $(OBJ): $(O)/build/%.o: src/%.c $(O)/build/config.h
 $(O)/build/config.h: $(O)/.config
 	@mkdir -p "$(@D)"
 	@echo " CONF  $@"
-	$(Q)./configure --op-h > $@
+	$(Q)$(O)/configure --op-h > $@
 endif
 
 ## Configuation files ##
@@ -102,7 +105,7 @@ $(O)/.config:
 
 $(O)/.config.mk: $(O)/.config
 	@echo " CONF  $@"
-	$(Q)./configure --op-makefile > $@
+	$(Q)$(O)/configure --op-makefile > $@
 
 ## Documentation targets ##
 .PHONY: docs
@@ -118,7 +121,7 @@ serve-docs: docs/parser-states.dot.png
 clean-docs:
 	@echo " CLEAN docs"
 	$(Q)$(RM) docs/parser-states.dot.png
-	$(Q)$(RM) -r site
+	$(Q)$(RM) -r html
 
 docs/%.dot.png: docs/%.dot
 	@echo " DOT $@"
-- 
cgit v1.2.3