obrebski/utt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Przejrzalem narzedzia pod katem includow CMDLINE_FILE.

Browse Source 
Gdzie mozna bylo, usunalem.
Jest pewien balagan w Makefile'ach, bo nadmiarowo dodalem -D ....
Calosc sie kompiluje i generuje sie tarball.


git-svn-id: svn://atos.wmid.amu.edu.pl/utt@36 e293616e-ec6a-49c2-aa92-f4a8b91c5d16
This commit is contained in:
pawelk 2008-05-01 20:27:23 +00:00
parent 28e9ae0020
commit 13a8a67bce
13 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/common/common.h
View File

@ -8,7 +8,11 @@
#include "../lib/const.h" #include "../lib/const.h"
#ifndef _CMDLINE_FILE
#error _CMDLINE_FILE constant not defined!
#else
#include _CMDLINE_FILE #include _CMDLINE_FILE
#endif
/************************************************** /**************************************************

4
app/src/cor/Makefile
View File

@ -8,7 +8,7 @@ CMDLINE_FILE='"../cor/cmdline.h"'
cor: main.cc corr.o $(LIB_PATH)/word.o \ cor: main.cc corr.o $(LIB_PATH)/word.o \
$(LIB_PATH)/auttools.o cmdline.c common_cor.o common.o $(LIB_PATH)/auttools.o cmdline.c common_cor.o common.o
g++ $(PAR) main.cc corr.o common.o \ g++ $(PAR) -D _CMDLINE_FILE=$(CMDLINE_FILE) main.cc corr.o common.o \
$(LIB_PATH)/word.o $(LIB_PATH)/auttools.o cmdline.c common_cor.o \ $(LIB_PATH)/word.o $(LIB_PATH)/auttools.o cmdline.c common_cor.o \
-o cor -o cor
@ -20,7 +20,7 @@ common.o: $(COMMON_PATH)/cmdline_common.ggo $(COMMON_PATH)/common.cc \
g++ $(PAR2) -D _CMDLINE_FILE=$(CMDLINE_FILE) $(COMMON_PATH)/common.cc g++ $(PAR2) -D _CMDLINE_FILE=$(CMDLINE_FILE) $(COMMON_PATH)/common.cc
common_cor.o: cmdline.h common_cor.cc common_cor.h common_cor.o: cmdline.h common_cor.cc common_cor.h
g++ $(PAR2) common_cor.cc g++ $(PAR2) -D _CMDLINE_FILE=$(CMDLINE_FILE) common_cor.cc
cmdline.c cmdline.h: cmdline.ggo cmdline.c cmdline.h: cmdline.ggo
gengetopt -i cmdline.ggo --conf-parser gengetopt -i cmdline.ggo --conf-parser

2
app/src/cor/common_cor.h
View File

@ -3,7 +3,7 @@
#include <stdio.h> #include <stdio.h>
#define _CMDLINE_FILE "../cor/cmdline.h" //do wyrzucenia - definicja w Makefile! #define _CMDLINE_FILE "../cor/cmdline.h"
#include "../common/common.h" #include "../common/common.h"
#include "cmdline.h" #include "cmdline.h"

2
app/src/cor/main.cc
View File

@ -1,7 +1,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <ctype.h> #include <ctype.h>
#include "../lib/iotools.h" #include "../lib/iotools.h"
#define _CMDLINE_FILE "../cor/cmdline.h" //do wyrzucenia - definicja w Makefile! #define _CMDLINE_FILE "../cor/cmdline.h"
#include "../common/common.h" #include "../common/common.h"
#include "common_cor.h" #include "common_cor.h"
#include "corr.hh" #include "corr.hh"

4
app/src/dgp/Makefile
View File

@ -19,7 +19,7 @@ bin = dgp
objs = $(sources:%.cc=%.o) objs = $(sources:%.cc=%.o)
${bin}: ${objs} ${bin}: ${objs}
${CXX} ${CXXFLAGS} -o $@ ${objs} ${CXX} ${CXXFLAGS} -D _CMDLINE_FILE=$(CMDLINE_FILE) -o $@ ${objs}
include $(sources:.cc=.d) include $(sources:.cc=.d)
@ -27,7 +27,7 @@ include $(sources:.cc=.d)
${CXX} -D _CMDLINE_FILE=$(CMDLINE_FILE) -c ${CXXFLAGS} -o $@ $< ${CXX} -D _CMDLINE_FILE=$(CMDLINE_FILE) -c ${CXXFLAGS} -o $@ $<
%.d: %.cc %.d: %.cc
$(CC) -MM $(CPPFLAGS) $< > $@.$$$$; \ $(CC) -MM $(CPPFLAGS) -D _CMDLINE_FILE=$(CMDLINE_FILE) $< > $@.$$$$; \
sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \ sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
rm -f $@.$$$$ rm -f $@.$$$$

2
app/src/dgp/main.cc
View File

@ -6,13 +6,13 @@
* Author: Tomasz Obrebski * Author: Tomasz Obrebski
*/ */
#include "cmdline.h"
#include "global.hh" #include "global.hh"
#include "mgraph.hh" #include "mgraph.hh"
#include "sgraph.hh" #include "sgraph.hh"
#include "grammar.hh" #include "grammar.hh"
#include "dgp0.hh" #include "dgp0.hh"
#include "../common/common.h" #include "../common/common.h"
#include "cmdline.h"
#define MAXSEGMENTS 500 #define MAXSEGMENTS 500

8
app/src/kor/Makefile
View File

@ -8,15 +8,15 @@ CMDLINE_FILE='"../kor/cmdline.h"'
kor: main.cc corr.o corlist.o cmdline.o $(LIB_PATH)/word.o \ kor: main.cc corr.o corlist.o cmdline.o $(LIB_PATH)/word.o \
$(LIB_PATH)/auttools.o cmdline.c common_cor.o common.o $(LIB_PATH)/auttools.o cmdline.c common_cor.o common.o
g++ $(PAR) main.cc corlist.o corr.o common.o \ g++ $(PAR) -D _CMDLINE_FILE=$(CMDLINE_FILE) main.cc corlist.o corr.o common.o \
$(LIB_PATH)/word.o $(LIB_PATH)/auttools.o cmdline.c common_cor.o \ $(LIB_PATH)/word.o $(LIB_PATH)/auttools.o cmdline.c common_cor.o \
-o kor -o kor
corr.o: corr.cc corr.hh cmdline.h corr.o: corr.cc corr.hh cmdline.h
g++ $(PAR2) corr.cc g++ $(PAR2) -D _CMDLINE_FILE=$(CMDLINE_FILE) corr.cc
corlist.o: corlist.cc corlist.h cmdline.h corlist.o: corlist.cc corlist.h cmdline.h
g++ $(PAR2) corlist.cc g++ $(PAR2) -D _CMDLINE_FILE=$(CMDLINE_FILE) corlist.cc
@ -25,7 +25,7 @@ common.o: cmdline.h $(COMMON_PATH)/cmdline_common.ggo $(COMMON_PATH)/common.cc \
g++ $(PAR2) -D _CMDLINE_FILE=$(CMDLINE_FILE) $(COMMON_PATH)/common.cc g++ $(PAR2) -D _CMDLINE_FILE=$(CMDLINE_FILE) $(COMMON_PATH)/common.cc
common_cor.o: cmdline.h common_cor.cc common_cor.h common_cor.o: cmdline.h common_cor.cc common_cor.h
g++ $(PAR2) common_cor.cc g++ $(PAR2) -D _CMDLINE_FILE=$(CMDLINE_FILE) common_cor.cc
cmdline.c cmdline.h: cmdline.ggo cmdline.c cmdline.h: cmdline.ggo
gengetopt -i cmdline.ggo --conf-parser gengetopt -i cmdline.ggo --conf-parser

5
app/src/kor/common_cor.h
View File

@ -2,9 +2,6 @@
#define __COMMON_COR_H #define __COMMON_COR_H
// SEKCJA STALYCH // SEKCJA STALYCH
#ifndef _CMDLINE_FILE
#define _CMDLINE_FILE "../kor/cmdline.h"
#endif
#define MAX_LEN 2 #define MAX_LEN 2
#define PREC 1000 #define PREC 1000
@ -12,7 +9,7 @@
// SEKCJA INCLUDOW // SEKCJA INCLUDOW
#include "../common/common.h" #include "../common/common.h"
#include _CMDLINE_FILE #include "cmdline.h"
// SEKCJA GENGETOPT // SEKCJA GENGETOPT

7
app/src/lem/Makefile
View File

@ -8,12 +8,13 @@ CMDLINE_FILE='"../lem/cmdline.h"'
lem: main.cc lem.o $(LIB_PATH)/auttools.o $(LIB_PATH)/word.o \ lem: main.cc lem.o $(LIB_PATH)/auttools.o $(LIB_PATH)/word.o \
cmdline.c common_lem.o common.o symtab.o cmdline.c common_lem.o common.o symtab.o
g++ $(PAR) main.cc lem.o $(LIB_PATH)/auttools.o \ g++ $(PAR) -D _CMDLINE_FILE=$(CMDLINE_FILE) \
main.cc lem.o $(LIB_PATH)/auttools.o \
$(LIB_PATH)/word.o cmdline.c common.o common_lem.o \ $(LIB_PATH)/word.o cmdline.c common.o common_lem.o \
symtab.o -o lem symtab.o -o lem
lem.o: lem.h lem.cc lem.o: lem.h lem.cc
g++ $(PAR2) lem.cc g++ $(PAR2) -D _CMDLINE_FILE=$(CMDLINE_FILE) lem.cc
# alphabet.o: $(LIB_PATH)/alphabet.h $(LIB_PATH)/alphabet.cc # alphabet.o: $(LIB_PATH)/alphabet.h $(LIB_PATH)/alphabet.cc
# g++ $(PAR2) $(LIB_PATH)/alphabet.cc # g++ $(PAR2) $(LIB_PATH)/alphabet.cc
@ -32,7 +33,7 @@ common.o: $(COMMON_PATH)/cmdline_common.ggo $(COMMON_PATH)/common.cc \
g++ $(PAR2) -D _CMDLINE_FILE=$(CMDLINE_FILE) $(COMMON_PATH)/common.cc g++ $(PAR2) -D _CMDLINE_FILE=$(CMDLINE_FILE) $(COMMON_PATH)/common.cc
common_lem.o: cmdline.h common_lem.h common_lem.cc common_lem.o: cmdline.h common_lem.h common_lem.cc
g++ $(PAR2) common_lem.cc g++ $(PAR2) -D _CMDLINE_FILE=$(CMDLINE_FILE) common_lem.cc
cmdline.c cmdline.h: cmdline.ggo cmdline.c cmdline.h: cmdline.ggo
gengetopt -i cmdline.ggo --conf-parser gengetopt -i cmdline.ggo --conf-parser

1
app/src/lem/common_lem.h
View File

@ -2,7 +2,6 @@
#define __COMMON_LEM__H #define __COMMON_LEM__H
#include <stdio.h> #include <stdio.h>
#define _CMDLINE_FILE "../lem/cmdline.h"
#include "../common/common.h" #include "../common/common.h"
#include "cmdline.h" #include "cmdline.h"

2
app/src/lem/main.cc
View File

@ -1,5 +1,5 @@
#include "../lib/iotools.h" #include "../lib/iotools.h"
#define _CMDLINE_FILE "../lem/cmdline.h" //do wyrzucenia - definicja w Makefile! #define _CMDLINE_FILE "../lem/cmdline.h"
#include "../common/common.h" #include "../common/common.h"
#include "common_lem.h" #include "common_lem.h"
#include "lem.h" #include "lem.h"

8
app/src/tok.c/Makefile
View File

@ -5,13 +5,14 @@ CMDLINE_FILE='"../tok.c/cmdline.h"'
tok: tok.o cmdline.c common_tok.o common.o tok: tok.o cmdline.c common_tok.o common.o
g++ $(PAR) tok.c cmdline.c common.o common_tok.o -o tok g++ $(PAR) -D _CMDLINE_FILE=$(CMDLINE_FILE) \
tok.c cmdline.c common.o common_tok.o -o tok
tok.o: tok.c cmdline.h tok.o: tok.c cmdline.h
g++ $(PAR2) tok.c g++ $(PAR2) -D _CMDLINE_FILE=$(CMDLINE_FILE) tok.c
common_tok.o: cmdline.h common_tok.cc common_tok.h common_tok.o: cmdline.h common_tok.cc common_tok.h
g++ $(PAR2) common_tok.cc g++ $(PAR2) -D _CMDLINE_FILE=$(CMDLINE_FILE) common_tok.cc
common.o: $(COMMON_PATH)/cmdline_common.ggo $(COMMON_PATH)/common.cc \ common.o: $(COMMON_PATH)/cmdline_common.ggo $(COMMON_PATH)/common.cc \
$(COMMON_PATH)/common.h $(COMMON_PATH)/common.h
@ -23,7 +24,6 @@ cmdline.ggo: cmdline_tok.ggo ../common/cmdline_common.ggo
cmdline.c cmdline.h: cmdline.ggo cmdline.c cmdline.h: cmdline.ggo
gengetopt -i cmdline.ggo --conf-parser gengetopt -i cmdline.ggo --conf-parser
copy: copy:
ifdef UTT_BIN_DIR ifdef UTT_BIN_DIR
cp tok ${UTT_BIN_DIR}/ cp tok ${UTT_BIN_DIR}/

1
app/src/tok.c/common_tok.h
View File

@ -2,7 +2,6 @@
#define __COMMON_TOK__H #define __COMMON_TOK__H
#include <stdio.h> #include <stdio.h>
#define _CMDLINE_FILE "../tok.c/cmdline.h"
#include "../common/common.h" #include "../common/common.h"
#include "cmdline.h" #include "cmdline.h"