From 93f5af69309744d81d34319c45b73554cfa2d1ce Mon Sep 17 00:00:00 2001
From: zolliker <zolliker>
Date: Tue, 18 Oct 2005 13:45:57 +0000
Subject: [PATCH] - split OBJ into a list for MK and a list for MZ -> avoid cvs
 conflicts

---
 make_gen | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/make_gen b/make_gen
index 8056640..d752ef3 100644
--- a/make_gen
+++ b/make_gen
@@ -16,11 +16,12 @@ OBJ=psi.o buffer.o ruli.o dmc.o nxsans.o nextrics.o sps.o pimotor.o \
 	el755driv.o amorscan.o serial.o scontroller.o  t_update.o \
 	t_rlp.o t_conv.o el737hpdriv.o dornier2.o el734hp.o \
 	el737hpv2driv.o swmotor2.o tricssupport.o amorcomp.o \
-	fsm.o logger.o sugar.o pardef.o amordrive.o\
-	ease.o strobj.o oxinst.o amorset.o\
-	ipsdriv.o ilmdriv.o itcdriv.o ighdriv.o euro2kdriv.o modbus.o \
+	$(MZOBJ) amordrive.o amorset.o \
 	dgrambroadcast.o sinq.o tabledrive.o
 
+MZOBJ=fsm.o logger.o sugar.o pardef.o ease.o strobj.o oxinst.o \
+	ipsdriv.o ilmdriv.o itcdriv.o ighdriv.o euro2kdriv.o modbus.o
+
 libpsi.a: $(OBJ)
 	rm -f libpsi.a
 	ar cr libpsi.a $(OBJ)