Index: app/src/dgp/Makefile
===================================================================
--- app/src/dgp/Makefile	(revision a5fdde96132cd61c3f2e6d56c426c96b741427c8)
+++ app/src/dgp/Makefile	(revision 28e9ae0020002f67cf91ba795ab44945930c0e98)
@@ -3,4 +3,7 @@
 SHELL = /bin/sh
 LIB_PATH=../../lib
+COMMON_PATH=../common
+CMDLINE_FILE='"../dgp/cmdline.h"'
+
 
 #vpath %.o  .
@@ -9,5 +12,5 @@
 
 sources = main.cc grammar.cc symbol.cc mgraph.cc sgraph.cc dgp0.cc cmdline.cc \
-          common.cc global.cc
+          $(COMMON_PATH)/common.cc global.cc
 
 bin  = dgp
@@ -22,5 +25,5 @@
 
 %.o: %.cc
-	${CXX} -c ${CXXFLAGS} -o $@ $<
+	${CXX} -D _CMDLINE_FILE=$(CMDLINE_FILE) -c ${CXXFLAGS} -o $@ $<
 
 %.d: %.cc
@@ -29,6 +32,15 @@
 	rm -f $@.$$$$
 
-cmdline.cc cmdline.h : cmdline.ggo
-	gengetopt --c-extension=cc -i cmdline.ggo
+# 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
+
+cmdline.ggo: cmdline_dgp.ggo ../common/cmdline_common.ggo
+	cat cmdline_dgp.ggo ../common/cmdline_common.ggo > cmdline.ggo
+# endnowe
+
 
 clean: