From b6109b9c36169227719202119e04d3007fe6459f Mon Sep 17 00:00:00 2001
From: obrebski <obrebski@e293616e-ec6a-49c2-aa92-f4a8b91c5d16>
Date: Tue, 22 Apr 2008 11:31:17 +0000
Subject: [PATCH] przygotowanie dgp do dystrybucji (nie skonczone)

git-svn-id: svn://atos.wmid.amu.edu.pl/utt@29 e293616e-ec6a-49c2-aa92-f4a8b91c5d16
---
 app/Makefile         |  2 +-
 app/src/dgp/Makefile | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/Makefile b/app/Makefile
index df8a6c0..a752eb3 100644
--- a/app/Makefile
+++ b/app/Makefile
@@ -27,7 +27,7 @@ export UTT_SHARE_DIR=${UTT_DIR}/share
 ##############################
 
 # list of components to be included in the distribution
-COMPONENTS = compiledic cor fla gph grp kon kor kot lem mar rm12 rs12 sen-l sen-nl ser tags tok.l unfla
+COMPONENTS = compiledic cor dgp fla gph grp kon kor kot lem mar rm12 rs12 sen-l sen-nl ser tags tok.l unfla
 # gue nie dziala!
 
 ##############################
diff --git a/app/src/dgp/Makefile b/app/src/dgp/Makefile
index f29ca18..5231750 100644
--- a/app/src/dgp/Makefile
+++ b/app/src/dgp/Makefile
@@ -2,7 +2,7 @@
 
 SHELL = /bin/sh
 
-vpath %.o  o
+#vpath %.o  .
 
 CXXFLAGS = -O2 -static
 
@@ -12,19 +12,19 @@ sources = main.cc grammar.cc symbol.cc mgraph.cc sgraph.cc dgp0.cc cmdline.cc \
 bin  = dgp
 
 # plik *.o sa umieszczane w podkatalogu o
-objs = $(sources:%.cc=o/%.o)
+objs = $(sources:%.cc=%.o)
 
 ${bin}: ${objs}
 	${CXX} ${CXXFLAGS} -o $@ ${objs}
 
 include $(sources:.cc=.d)
 
-o/%.o: %.cc
+%.o: %.cc
 	${CXX} -c ${CXXFLAGS} -o $@ $<
 
 %.d: %.cc
 	$(CC) -MM $(CPPFLAGS) $< > $@.$$$$; \
-	sed 's,\($*\)\.o[ :]*,o/\1.o $@ : ,g' < $@.$$$$ > $@; \
+	sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
 	rm -f $@.$$$$
 
 cmdline.cc cmdline.h : cmdline.ggo
@@ -36,3 +36,8 @@ clean:
 
 prof: dgp
 	gprof dgp ~/tmp/dgp-pl/gmon.out > dgp.prof
+
+copy:
+ifdef UTT_BIN_DIR
+	cp dgp dgc canonize $(UTT_BIN_DIR)
+endif