Changeset 13a8a67 for app/src/lem

Timestamp:

05/01/08 22:27:23 (17 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/lem

Files:

• Makefile (modified) (2 diffs)
• common_lem.h (modified) (1 diff)
• main.cc (modified) (1 diff)

app/src/lem/Makefile

@@ -9 +9 @@
 lem: main.cc lem.o  $(LIB_PATH)/auttools.o $(LIB_PATH)/word.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 \
         symtab.o -o lem
 
 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
@@ -33 +34 @@
 
 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

app/src/lem/common_lem.h

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

app/src/lem/main.cc

@@ -1 +1 @@
 #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_lem.h"