Changeset 13a8a67 for app/src/kor

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/kor

Files:

• Makefile (modified) (2 diffs)
• common_cor.h (modified) (2 diffs)

app/src/kor/Makefile

@@ -9 +9 @@
 kor: main.cc corr.o corlist.o cmdline.o $(LIB_PATH)/word.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 \
         -o kor
 
 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
-        g++ $(PAR2) corlist.cc
+        g++ $(PAR2) -D _CMDLINE_FILE=$(CMDLINE_FILE) corlist.cc
         
 
@@ -26 +26 @@
 
 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

app/src/kor/common_cor.h

@@ -3 +3 @@
 
 // SEKCJA STALYCH
-#ifndef _CMDLINE_FILE
-  #define _CMDLINE_FILE "../kor/cmdline.h"
-#endif
 
 #define MAX_LEN 2
@@ -13 +10 @@
 // SEKCJA INCLUDOW
 #include "../common/common.h"
-#include _CMDLINE_FILE
+#include "cmdline.h"