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