Changeset 28e9ae0


Ignore:
Timestamp:
04/30/08 13:19:17 (16 years ago)
Author:
obrebski <obrebski@…>
Branches:
master, help
Children:
13a8a67
Parents:
12d8443
git-author:
obrebski <obrebski@…> (04/30/08 13:19:17)
git-committer:
obrebski <obrebski@…> (04/30/08 13:19:17)
Message:

dgp korzysta z normalnego common.cc i bierze wspolne parametry z cmdline_common.ggo

git-svn-id: ​svn://atos.wmid.amu.edu.pl/utt@35 e293616e-ec6a-49c2-aa92-f4a8b91c5d16

Location:
app/src/dgp
Files:
1 added
3 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • app/src/dgp/Makefile

    ra5fdde9 r28e9ae0  
    33SHELL = /bin/sh 
    44LIB_PATH=../../lib 
     5COMMON_PATH=../common 
     6CMDLINE_FILE='"../dgp/cmdline.h"' 
     7 
    58 
    69#vpath %.o  . 
    … …  
    912 
    1013sources = main.cc grammar.cc symbol.cc mgraph.cc sgraph.cc dgp0.cc cmdline.cc \ 
    11           common.cc global.cc 
     14          $(COMMON_PATH)/common.cc global.cc 
    1215 
    1316bin  = dgp 
    … …  
    2225 
    2326%.o: %.cc 
    24         ${CXX} -c ${CXXFLAGS} -o $@ $< 
     27        ${CXX} -D _CMDLINE_FILE=$(CMDLINE_FILE) -c ${CXXFLAGS} -o $@ $< 
    2528 
    2629%.d: %.cc 
    … …  
    2932        rm -f $@.$$$$ 
    3033 
    31 cmdline.cc cmdline.h : cmdline.ggo 
    32         gengetopt --c-extension=cc -i cmdline.ggo 
     34# stare: 
     35# cmdline.cc cmdline.h : cmdline.ggo 
     36#       gengetopt --c-extension=cc -i cmdline.ggo 
     37# nowe 
     38cmdline.cc cmdline.h: cmdline.ggo 
     39        gengetopt -i cmdline.ggo  --c-extension=cc --conf-parser 
     40 
     41cmdline.ggo: cmdline_dgp.ggo ../common/cmdline_common.ggo 
     42        cat cmdline_dgp.ggo ../common/cmdline_common.ggo > cmdline.ggo 
     43# endnowe 
     44 
    3345 
    3446clean: 

  • app/src/dgp/main.cc

    r0214596 r28e9ae0  
    1313#include "grammar.hh" 
    1414#include "dgp0.hh" 
    15 #include "common.h" 
     15#include "../common/common.h" 
    1616 
    1717#define MAXSEGMENTS 500 
    … …  
    7575    char segtype[80]; 
    7676 
    77     seg_mnode[segcount] = processseg(line, args) ? mgraph.add_node(line) : -1; 
     77    seg_mnode[segcount] = process_seg(line, args) ? mgraph.add_node(line) : -1; 
    7878 
    7979    segcount++; 

  • app/src/dgp/mgraph.cc

    r0214596 r28e9ae0  
    33#include "thesymbols.hh" 
    44#include "const.hh" 
    5 #include "common.h" 
    65 
    76#include <stdio.h> 

  • app/src/dgp/mgraph.hh

    r0214596 r28e9ae0  
    66#include "const.hh" 
    77#include "thesymbols.hh" 
    8 #include "common.h" 
     8#include "../common/common.h" 
    99 
    1010class MNode 
Note: See TracChangeset for help on using the changeset viewer.