Index: _old/app/src/tok.c/Makefile
===================================================================
--- _old/app/src/tok.c/Makefile	(revision 1e121f45e2d091fcd34a893291b8453e350d5884)
+++ _old/app/src/tok.c/Makefile	(revision a6e708f37f1025d3fd1cd8a7fe87a6029d723cbe)
@@ -1,6 +1,5 @@
-PAR=-Wno-deprecated -O3 -fpermissive
+PAR=-Wno-deprecated -O3
 PAR2=-c -Wno-deprecated -O3
 LIB_PATH=../lib
-COMMON_PATH=../common
 CMDLINE_FILE='"../tok.c/cmdline.h"'
 
@@ -16,9 +15,10 @@
 	g++ $(PAR2) -D _CMDLINE_FILE=$(CMDLINE_FILE) common_tok.cc
 
-common.o: cmdline_common
+common.o: $(COMMON_PATH)/cmdline_common.ggo $(COMMON_PATH)/common.cc \
+	$(COMMON_PATH)/common.h
 	g++ $(PAR2) -D _CMDLINE_FILE=$(CMDLINE_FILE) $(COMMON_PATH)/common.cc
 
-cmdline.ggo: cmdline_tok.ggo $(COMMON_PATH)/cmdline_common.ggo
-	cat cmdline_tok.ggo $(COMMON_PATH)/cmdline_common.ggo > cmdline.ggo
+cmdline.ggo: cmdline_tok.ggo ../common/cmdline_common.ggo
+	cat cmdline_tok.ggo ../common/cmdline_common.ggo > cmdline.ggo
 
 cmdline.c cmdline.h: cmdline.ggo
@@ -32,10 +32,6 @@
 
 clean: clean.cmdline
-	rm *.o || true
-	rm tok || true
+	rm *.o
 
 clean.cmdline:
 	rm cmdline.*
-
-include $(COMMON_PATH)/common.mk
-include $(LIB_PATH)/lib.mk