--- a/Makefile.gen	Wed Mar 09 13:55:48 2016 +0200
+++ b/Makefile.gen	Wed Mar 09 14:03:10 2016 +0200
@@ -4,9 +4,6 @@
 CFLAGS += -DTH_PRINTF_DEBUG=1
 THLIBS  = ./
 
-MKDIR ?= mkdir
-MKDIR_P ?= $(MKDIR) -p
-
 #
 # Objects
 #
@@ -15,57 +12,16 @@
 	th_args.o th_crypto.o th_datastruct.o th_network.o
 
 
-
 TESTS_OBJ=tests.o
 TESTS_BIN=$(BINPATH)tests$(EXEEXT)
 
 TARGETS += $(TESTS_BIN)
-NOBUILD_TARGETS += $(OBJPATH) $(BINPATH)
-NOINST_TARGETS += $(THLIBS_A)
-
-
-#
-# Target rules
-#
-all: $(NOBUILD_TARGETS) $(NOINST_TARGETS) $(TARGETS)
-
-$(THLIBS)th_string.c: $(addprefix $(THLIBS), th_printf1.c th_strmatch.c th_string.h)
-	touch $@
-
-$(OBJPATH) $(BINPATH):
-	@echo " MKDIR $@"
-	@$(MKDIR_P) $@
-
-$(OBJPATH)%.o: %.c %.h $(THLIBS_DEP)
-	@echo " CC $@"
-	@$(CC) $(CFLAGS) -c -o $@ $< -I$(THLIBS)
-
-$(OBJPATH)%.o: %.c $(THLIBS_DEP)
-	@echo " CC $@"
-	@$(CC) $(CFLAGS) -c -o $@ $< -I$(THLIBS)
-
-
-$(THLIBS_A): $(addprefix $(OBJPATH),$(THLIBS_OBJ))
-	@echo " AR $@"
-	@$(AR) cru $@ $(addprefix $(OBJPATH),$(THLIBS_OBJ))
-	@$(RANLIB) $@
 
 $(TESTS_BIN): $(addprefix $(OBJPATH),$(TESTS_OBJ)) $(THLIBS_A)
 	@echo " LINK $@"
 	@$(CC) $(CFLAGS) -o $@ $+ $(LDFLAGS)
 
-
 check: $(TESTS_BIN)
 	$(TESTS_BIN) -v
 
-#
-# Special targets
-#
-.PHONY: clean srcclean all
-
-clean:
-	$(RM) $(TARGETS) $(NOINST_TARGETS) $(OBJPATH)*.o
-
-srcclean: clean
-	$(RM) *~
-
+include $(THLIBS)/Makefile.inc

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Makefile.inc	Wed Mar 09 14:03:10 2016 +0200
@@ -0,0 +1,48 @@
+NOBUILD_TARGETS += $(OBJPATH) $(BINPATH)
+NOINST_TARGETS += $(THLIBS_A)
+
+MKDIR ?= mkdir
+MKDIR_P ?= $(MKDIR) -p
+
+.PHONY: clean srcclean all
+
+#
+# Target rules
+#
+all: $(NOBUILD_TARGETS) $(NOINST_TARGETS) $(TARGETS)
+
+
+$(THLIBS)th_string.c: $(addprefix $(THLIBS), th_printf1.c th_strmatch.c th_string.h)
+	touch $@
+
+$(OBJPATH) $(BINPATH):
+	@echo " MKDIR $@"
+	@$(MKDIR_P) $@
+
+$(OBJPATH)%.o: $(THLIBS)%.c $(THLIBS)%.h $(THLIBS_DEP)
+	@echo " CC $@ $+"
+	@$(CC) $(CFLAGS) -c -o $@ $<
+
+$(OBJPATH)%.o: %.c %.h $(THLIBS_DEP)
+	@echo " CC $@ $+"
+	@$(CC) $(CFLAGS) -c -o $@ $< -I$(THLIBS)
+
+$(OBJPATH)%.o: %.c $(THLIBS_DEP)
+	@echo " CC $@"
+	@$(CC) $(CFLAGS) -c -o $@ $< -I$(THLIBS)
+
+
+$(THLIBS_A): $(addprefix $(OBJPATH),$(THLIBS_OBJ))
+	@echo " AR $@"
+	@$(AR) cru $@ $(addprefix $(OBJPATH),$(THLIBS_OBJ))
+	@$(RANLIB) $@
+
+#
+# Special targets
+#
+clean:
+	$(RM) $(TARGETS) $(NOINST_TARGETS) $(OBJPATH)*.o
+
+srcclean: clean
+	$(RM) *~
+