Changeset 13a8a67 for app/src/tok.c

Timestamp:

05/01/08 22:27:23 (16 years ago)

Author:

pawelk <pawelk@…>

Branches:

master, help

Children:

df77b87

Parents:

28e9ae0

git-author:

pawelk <pawelk@…> (05/01/08 22:27:23)

git-committer:

pawelk <pawelk@…> (05/01/08 22:27:23)

Message:

Przejrzalem narzedzia pod katem includow CMDLINE_FILE.
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

Location:

app/src/tok.c

Files:

• Makefile (modified) (2 diffs)
• common_tok.h (modified) (1 diff)

app/src/tok.c/Makefile

@@ -6 +6 @@
 
 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 
-        g++ $(PAR2) tok.c
+        g++ $(PAR2) -D _CMDLINE_FILE=$(CMDLINE_FILE) tok.c
 
 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_PATH)/common.h
+common.o: $(COMMON_PATH)/cmdline_common.ggo $(COMMON_PATH)/common.cc \
+        $(COMMON_PATH)/common.h
         g++ $(PAR2) -D _CMDLINE_FILE=$(CMDLINE_FILE) $(COMMON_PATH)/common.cc
 
@@ -23 +24 @@
 cmdline.c cmdline.h: cmdline.ggo
         gengetopt -i cmdline.ggo --conf-parser
-
 
 copy:

app/src/tok.c/common_tok.h

@@ -3 +3 @@
 
 #include <stdio.h>
-#define _CMDLINE_FILE "../tok.c/cmdline.h"
 #include "../common/common.h"