Index: src/dgp/Makefile
===================================================================
--- src/dgp/Makefile	(revision 5f4d9c3b32eea7b6643a751aa75bdb05b7d41576)
+++ src/dgp/Makefile	(revision e7de6cc88c605c4f810cbc852e843294b4b0e8ac)
@@ -1,3 +1,5 @@
+
 include ../../config.mak
+
 
 SHELL = /bin/sh
@@ -6,13 +8,10 @@
 CMDLINE_FILE='"../dgp/cmdline.h"'
 
+
 #vpath %.o  .
 
-ifeq ($(BUILD_STATIC), yes)
-	LDFLAGS += -static
-endif
+CXXFLAGS = -g -static
 
-CXXFLAGS += -O2
-
-sources = main.cc grammar.cc symbol.cc mgraph.cc sgraph.cc dgp0.cc cmdline.cc \
+sources = main.cc grammar.cc symbol.cc mgraph.cc sgraph.cc dgp1.cc cmdline.cc \
           $(COMMON_PATH)/common.cc global.cc
 
@@ -23,10 +22,10 @@
 
 ${bin}: ${objs}
-	$(CXX) $(CXXFLAGS) -D _CMDLINE_FILE=$(CMDLINE_FILE) -o $@ ${objs} $(LDFLAGS)
+	${CXX} ${CXXFLAGS} -D _CMDLINE_FILE=$(CMDLINE_FILE) -o $@ ${objs}
 
 include $(sources:.cc=.d)
 
 %.o: %.cc
-	$(CXX) -D _CMDLINE_FILE=$(CMDLINE_FILE) -c ${CXXFLAGS} -o $@ $<
+	${CXX} -D _CMDLINE_FILE=$(CMDLINE_FILE) -c ${CXXFLAGS} -o $@ $<
 
 %.d: %.cc
@@ -35,22 +34,22 @@
 	rm -f $@.$$$$
 
-# stare:
-# cmdline.cc cmdline.h : cmdline.ggo
-# 	gengetopt --c-extension=cc -i cmdline.ggo
-# nowe
+
 cmdline.cc cmdline.h: cmdline.ggo
-	$(GENGETOPT) -i cmdline.ggo  --c-extension=cc --conf-parser
+	gengetopt -i cmdline.ggo  --c-extension=cc --conf-parser
 
 cmdline.ggo: cmdline_dgp.ggo ../common/cmdline_common.ggo
 	cat cmdline_dgp.ggo ../common/cmdline_common.ggo > cmdline.ggo
-# endnowe
 
 
+
+.PHONY: clean
 clean:
-	rm ${bin} ${objs} cmdline.cc cmdline.h
-	rm -rf *.d
+	rm -f ${bin} ${objs} cmdline.*
+	rm -f *.d
 
+.PHONY: prof
 prof: dgp
 	gprof dgp ~/tmp/dgp-pl/gmon.out > dgp.prof
+
 
 .PHONY: install
@@ -58,7 +57,4 @@
 ifdef BIN_DIR
 	install -m 0755 dgp $(BIN_DIR)
-	install -m 0755 dgc $(BIN_DIR)
-	install -m 0755 canonize $(BIN_DIR)
-	install -m 0755 tre $(BIN_DIR)
 endif
 
@@ -67,6 +63,3 @@
 ifdef BIN_DIR
 	rm $(BIN_DIR)/dgp
-	rm $(BIN_DIR)/dgc
-	rm $(BIN_DIR)/canonize
-	rm $(BIN_DIR)/tre
 endif