# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1491522511 -10800
# Node ID 0a2f32b8a26ecfa3a185568c971f1660c453bb38
# Parent  d41cb5983772d9e8e526f7ee7351fe4889d7f263
Improve the build system.

diff -r d41cb5983772 -r 0a2f32b8a26e Makefile
--- a/Makefile	Mon Nov 07 02:57:23 2016 +0200
+++ b/Makefile	Fri Apr 07 02:48:31 2017 +0300
@@ -4,17 +4,13 @@
 #
 
 # Miscellaneous
+BINTOOL_PREFIX =
 PREFIX = /usr/local
 BINPATH = ./
 OBJPATH = obj/unix/
 EXEEXT =
 
-# C-compiler, flags and linker flags
-CC ?= gcc
-AR ?= ar
-RANLIB ?= ranlib
-INSTALL ?= install
-
+# Compiler flags and linker flags
 CFLAGS += -DHAVE_CONFIG_H
 LDFLAGS +=
 
diff -r d41cb5983772 -r 0a2f32b8a26e Makefile.gen
--- a/Makefile.gen	Mon Nov 07 02:57:23 2016 +0200
+++ b/Makefile.gen	Fri Apr 07 02:48:31 2017 +0300
@@ -20,6 +20,8 @@
 
 TARGETS += $(TESTS_BIN)
 
+include $(THLIBS)/Makefile.inc
+
 $(TESTS_BIN): $(addprefix $(OBJPATH),$(TESTS_OBJ)) $(THLIBS_A)
 	@echo " LINK $@"
 	@$(CC) $(CFLAGS) -o $@ $+ $(LDFLAGS)
@@ -27,4 +29,3 @@
 check: $(TESTS_BIN)
 	$(TESTS_BIN) -v
 
-include $(THLIBS)/Makefile.inc
diff -r d41cb5983772 -r 0a2f32b8a26e Makefile.inc
--- a/Makefile.inc	Mon Nov 07 02:57:23 2016 +0200
+++ b/Makefile.inc	Fri Apr 07 02:48:31 2017 +0300
@@ -1,10 +1,15 @@
+CC = $(BINTOOL_PREFIX)gcc
+CXX = $(BINTOOL_PREFIX)g++
+AR = $(BINTOOL_PREFIX)ar
+RANLIB = $(BINTOOL_PREFIX)ranlib
+INSTALL ?= install
+MKDIR ?= mkdir
+MKDIR_P ?= $(MKDIR) -p
+
 NOBUILD_TARGETS += $(OBJPATH) $(BINPATH)
 NOINST_TARGETS += $(THLIBS_A)
 
-MKDIR ?= mkdir
-MKDIR_P ?= $(MKDIR) -p
 
-.PHONY: clean srcclean all
 
 ##
 ## Target rules
@@ -13,7 +18,7 @@
 
 
 $(THLIBS)th_string.c: $(addprefix $(THLIBS), th_printf1.c th_strmatch.c th_string.h)
-	touch $@
+	@touch $@
 
 $(OBJPATH) $(BINPATH):
 	@echo " MKDIR $@"
@@ -57,3 +62,4 @@
 srcclean: clean
 	$(RM) *~
 
+.PHONY: clean srcclean all