# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1491522548 -10800
# Node ID 468d521240c65123f39914ac38aef0487eff3f87
# Parent  8c3b3d8009f6855191bdc00fb828f166018a5e61# Parent  1b3472ba7b23b70dcf3a254eac9aa273872c74af
Merged.

diff -r 1b3472ba7b23 -r 468d521240c6 Makefile
--- a/Makefile	Sun Jan 01 01:59:49 2017 +0200
+++ b/Makefile	Fri Apr 07 02:49:08 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 1b3472ba7b23 -r 468d521240c6 Makefile.gen
--- a/Makefile.gen	Sun Jan 01 01:59:49 2017 +0200
+++ b/Makefile.gen	Fri Apr 07 02:49:08 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 1b3472ba7b23 -r 468d521240c6 Makefile.inc
--- a/Makefile.inc	Sun Jan 01 01:59:49 2017 +0200
+++ b/Makefile.inc	Fri Apr 07 02:49:08 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
diff -r 1b3472ba7b23 -r 468d521240c6 Makefile.w32
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Makefile.w32	Fri Apr 07 02:49:08 2017 +0300
@@ -0,0 +1,24 @@
+#
+# For win32 version cross-compilation with MinGW suite @ Linux
+#
+
+# Miscellaneous
+BINTOOL_PREFIX = i686-w64-mingw32-
+PREFIX =
+BINPATH = ./
+OBJPATH = obj/win32/
+EXEEXT = .exe
+
+# Compiler flags and linker flags
+CFLAGS += -DHAVE_STRING_H -DTH_BYTEORDER=TH_LITTLE_ENDIAN -mconsole
+
+
+
+###
+### Stuff
+###
+#NOINST_TARGETS += $(ENDIANCHK_BIN) config.h
+#THLIBS_DEP += config.h
+
+include Makefile.gen
+