--- a/Makefile.gen	Fri Feb 12 03:03:51 2016 +0200
+++ b/Makefile.gen	Fri Feb 12 03:05:07 2016 +0200
@@ -1,6 +1,9 @@
-CFLAGS += -g -W -Wall -Wextra -DTH_NO_DEFAULTS
+###
+### Main makefile
+###
+CFLAGS += -g -W -Wall -Wextra -DTH_NO_DEFAULTS -I.
 CFLAGS += -O2
-#CFLAGS += -std=c99 -pedantic
+CFLAGS += -std=c11 -pedantic -D_XOPEN_SOURCE=500
 THLIBS=th-libs/
 
 MKDIR ?= mkdir
@@ -18,19 +21,20 @@
 # Objects
 #
 THLIBS_A=$(OBJPATH)thlibs.a
-THLIBS_OBJ=th_util.o th_string.o th_args.o th_ioctx.o th_config.o th_network.o
+THLIBS_OBJ=th_util.o th_string.o th_args.o th_ioctx.o th_file.o th_config.o th_network.o
 
 NNCHAT_OBJ=main.o util.o ui.o
 NNCHAT_BIN=$(BINPATH)nnchat$(EXEEXT)
 
-TARGETS+=$(THLIBS_A) $(NNCHAT_BIN)
+TARGETS += $(NNCHAT_BIN)
+NOBUILD_TARGETS += $(OBJPATH) $(BINPATH)
+NOINST_TARGETS += $(THLIBS_A)
 
-NONBUILD+=$(OBJPATH) $(BINPATH)
 
 #
 # Target rules
 #
-all: $(NONBUILD) $(TARGETS)
+all: $(NOBUILD_TARGETS) $(NOINST_TARGETS) $(TARGETS)
 
 $(OBJPATH):
 	$(MKDIR_P) $@
@@ -69,7 +73,7 @@
 # Special targets
 #
 clean:
-	$(RM) $(TARGETS) $(OBJPATH)*.o
+	$(RM) $(TARGETS) $(NOINST_TARGETS) $(OBJPATH)*.o
 
 srcclean: clean
 	$(RM) *~