From 11b5d7a072651f8e410fccad9abc1f33e3bb99a5 Mon Sep 17 00:00:00 2001
From: alex <alex@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Fri, 14 Oct 1994 18:21:02 +0000
Subject: [PATCH] Corretti makefile

git-svn-id: svn://10.65.10.50/trunk@381 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 ba/makefile    | 28 ++++++++++++----------------
 ba/maketrc.mak |  9 +++------
 2 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/ba/makefile b/ba/makefile
index bac8590d7..6c454c475 100755
--- a/ba/makefile
+++ b/ba/makefile
@@ -4,6 +4,11 @@ FRL=$(EP)ba0.frl $(EP)ba1.frl $(EP)ba2.frl $(EP)ba3.frl $(EP)ba4.frl $(EP)ba5.fr
 $(O)/%.o:        %.cpp
 	$(CCOMP) $(CFLAGSD) $(basename $<) $(O)/$*
 
+$(O)/%.o:	 ../cg/%.cpp
+	cd ../cg
+	$(CCOMP) $(CFLAGSD) $(basename $<) $(O)/$*
+	cd ../ba
+
 $(EP)%.msk: %.uml
 	$(MCOMP) $(basename $<) $(basename $@)
 
@@ -25,7 +30,7 @@ include ../include/include.mak
 
 base:           $(EXE)  etc
 
-etc:            masks rpts mnus inis $(FRL) $(EP)dir.gen $(EP)trc.gen
+etc:            masks rpts mnus inis $(FRL) $(EP)trc.gen
 
 BA1100H=ba1100.h ba1100a.h
 
@@ -76,15 +81,6 @@ $(O)/ba3200.o:  ba3200.cpp $(I33) $(I17) $(I50) $(I39) ba3.h ba3200.h $(I15) $(U
 
 $(O)/ba3300.o:  ba3300.cpp $(I50) $(I17) $(I33) $(I39) $(I31) $(I12) $(I41) ba3.h ba3300.h $(I15) $(U2)
 
-$(O)/ba3400.o:  ba3400.cpp $(I53)
-
-$(O)/ba3500.o:  ba3500.cpp ba3500.h $(I53)
-
-$(O)/ba3600.o:  ba3600.cpp ba3600.h $(I53)
-
-$(O)/ba3700.o:  ba3700.cpp ba3700.h $(I53)
-$(O)/ba3.o:  ba3.cpp $(S1) $(I10) ba3.h 
-
 $(O)/ba3100.o:  ba3100.cpp $(I53) $(I1) $(I15) $(I42) ba3.h ba3100.h batbreg.h 
 
 $(O)/ba3200.o:  ba3200.cpp $(I33) $(I50) $(I39) $(I42) $(I31) ba3.h ba3200.h 
@@ -99,8 +95,10 @@ $(O)/ba3600.o:  ba3600.cpp $(I33) $(I50) $(I17) $(I39) $(I42) $(I31) $(I12) $(I1
 
 $(O)/ba3700.o:  ba3700.cpp $(I24) $(I33) $(I54) $(I53) $(I39) $(I42) $(I43) $(I56) $(I31) ba3700.h $(IP)nditte.h 
 
-$(EP)ba3: $(O)/ba3.o $(O)/ba3100.o $(O)/ba3200.o $(O)/ba3300.o $(O)/ba3400.o $(O)/ba3500.o $(O)/ba3600.o $(O)/ba3700.o $(EP)/ba3.frl $(LIBD1) $(EP)ba3.frl
-	$(LINK) $(LFLAGSD1) $@ $(O)/ba3.o $(O)/ba3100.o $(O)/ba3200.o $(O)/ba3300.o $(O)/ba3400.o $(O)/ba3500.o $(O)/ba3600.o $(O)/ba3700.o
+$(O)/pagament.o:   ../cg/pagament.cpp ../cg/pagament.h $(I7) $(I10) $(I27) $(I31) $(I42) $(I54)
+
+$(EP)ba3: $(O)/ba3.o $(O)/ba3100.o $(O)/ba3200.o $(O)/ba3300.o $(O)/ba3400.o $(O)/ba3500.o $(O)/ba3600.o $(O)/ba3700.o $(O)/pagament.o $(EP)/ba3.frl $(LIBD1) $(EP)ba3.frl
+	$(LINK) $(LFLAGSD1) $@ $(O)/ba3.o $(O)/ba3100.o $(O)/ba3200.o $(O)/ba3300.o $(O)/ba3400.o $(O)/ba3500.o $(O)/ba3600.o $(O)/ba3700.o $(O)/pagament.o
 
 $(EP)/ba3.frl: ba3.url  $(U1)
 	$(RCOMP) ba3 -l $(EP)/ba3
@@ -162,13 +160,11 @@ $(EP)ba4.frl: ba4.url  $(U1)
 
 	$(RCOMP) ba4 -l $(EP)ba4
 
-$(EP)dir.gen: dir.gen.asc
-	uudecode dir.gen.asc
-	mv dir.gen $(EP)
-
 $(EP)trc.gen: trc.gen.asc
 	uudecode trc.gen.asc
 	mv trc.gen $(EP)
+	uudecode dir.gen.asc
+	mv dir.gen $(EP)
 
 masks:  $(EP)ba1100a.msk $(EP)ba1100b.msk $(EP)ba1100c.msk $(EP)ba1100d.msk $(EP)ba1100e.msk $(EP)ba1100f.msk $(EP)ba1300a.msk $(EP)ba1300b.msk $(EP)ba2300a.msk $(EP)ba2300b.msk $(EP)ba2300c.msk $(EP)ba2300d.msk \
 	$(EP)ba3200a.msk $(EP)ba3300a.msk $(EP)ba3500a.msk $(EP)ba3600a.msk $(EP)ba3700a.msk $(EP)ba4100a.msk $(EP)ba4200b.msk $(EP)ba4200c.msk $(EP)ba4300a.msk $(EP)ba4400a.msk \
diff --git a/ba/maketrc.mak b/ba/maketrc.mak
index c9298e509..2562a4def 100755
--- a/ba/maketrc.mak
+++ b/ba/maketrc.mak
@@ -1,12 +1,9 @@
 
-all: dir.gen.asc trc.gen.asc
-
-dir.gen.asc: $(EP)dir.gen
-	uuencode $(EP)dir.gen dir.gen >dir.gen.asc
-	touch $(EP)dir.gen
+all: trc.gen.asc
 
 trc.gen.asc: $(EP)trc.gen
 	uuencode $(EP)trc.gen trc.gen >trc.gen.asc
 	touch $(EP)trc.gen
-
+	uuencode $(EP)dir.gen dir.gen >dir.gen.asc
+	touch $(EP)dir.gen