PSI sics-cvs-psi-complete-tree-post-site-support

make_gen

@@ -5,72 +5,74 @@
 # Markus Zolliker March 2003
 #---------------------------------------------------------------------------
 
+VPATH=$(SRC)
+ROOT=.
+
 COBJ = Sclient.o network.o ifile.o   intcli.o $(FORTIFYOBJ)  
 SOBJ =  network.o ifile.o conman.o SCinter.o splitter.o passwd.o \
        servlog.o sicvar.o nserver.o SICSmain.o \
        sicsexit.o  costa.o task.o $(FORTIFYOBJ)\
        macro.o ofac.o obpar.o obdes.o drive.o status.o intserv.o \
        devexec.o mumo.o mumoconf.o selector.o selvar.o fupa.o lld.o \
-       lld_blob.o buffer.o strrepl.o ruli.o lin2ang.o fomerge.o\
+       lld_blob.o  strrepl.o lin2ang.o fomerge.o\
        script.o o2t.o  alias.o napi.o nxdata.o stringdict.o sdynar.o\
-       histmem.o histdriv.o histsim.o sinqhmdriv.o interface.o callback.o \
+       histmem.o histdriv.o histsim.o  interface.o callback.o \
         event.o emon.o evcontroller.o evdriver.o simev.o perfmon.o \
-       danu.o itc4driv.o itc4.o nxdict.o nxsans.o varlog.o stptok.o nread.o \
-       dilludriv.o scan.o fitcenter.o telnet.o token.o scontroller.o serial.o \
-       tclev.o hkl.o integrate.o optimise.o dynstring.o nextrics.o nxutil.o \
-       mesure.o uubuffer.o serialwait.o commandlog.o sps.o udpquieck.o \
-       sanswave.o faverage.o bruker.o rmtrail.o fowrite.o ltc11.o \
-       simchop.o choco.o chadapter.o docho.o trim.o eurodriv.o scaldate.o \
-       hklscan.o xytable.o amor2t.o nxamor.o amorscan.o amorstat.o \
-       circular.o el755driv.o maximize.o sicscron.o tecsdriv.o sanscook.o \
-       tasinit.o tasutil.o t_rlp.o t_conv.o d_sign.o d_mod.o \
-       tasdrive.o tasscan.o synchronize.o definealias.o swmotor.o t_update.o \
-       hmcontrol.o userscan.o slsmagnet.o rs232controller.o lomax.o \
-       polterwrite.o fourlib.o motreg.o motreglist.o anticollider.o \
-       s_rnge.o sig_die.o gpibcontroller.o $(NIOBJ) ecb.o ecbdriv.o \
-       ecbcounter.o hmdata.o tdchm.o nxscript.o A1931.o frame.o \
-       tclintimpl.o sicsdata.o
+       danu.o  nxdict.o varlog.o stptok.o nread.o \
+       scan.o fitcenter.o telnet.o token.o  wwildcard.o\
+       tclev.o hkl.o integrate.o optimise.o dynstring.o nxutil.o \
+       mesure.o uubuffer.o  commandlog.o udpquieck.o \
+       rmtrail.o  help.o nxupdate.o\
+       simchop.o choco.o chadapter.o  trim.o scaldate.o \
+       hklscan.o xytable.o   \
+       circular.o  maximize.o sicscron.o  \
+       d_sign.o d_mod.o tcldrivable.o \
+       synchronize.o definealias.o  \
+       hmcontrol.o userscan.o  rs232controller.o lomax.o \
+       fourlib.o motreg.o motreglist.o anticollider.o \
+       s_rnge.o sig_die.o gpibcontroller.o $(NIOBJ) \
+       hmdata.o  nxscript.o  tclintimpl.o sicsdata.o
  
-MOTOROBJ = motor.o el734driv.o simdriv.o el734dc.o pipiezo.o pimotor.o
+MOTOROBJ = motor.o  simdriv.o  
 COUNTEROBJ =  countdriv.o simcter.o counter.o
-DMCOBJ     =  dmc.o
-VELOOBJ    = velo.o velosim.o velodorn.o velodornier.o
+VELOOBJ    = velo.o velosim.o 
 
 .SUFFIXES:
 .SUFFIXES: .tcl .htm .c .o
 
-# the following lines are not compatible with GNUmake using VPATH
-# they are not needed, as they are defined by default
-#.c.o:
-#	$(CC) $(CFLAGS) -c $*.c
+all:    SICServer
 
-all:    $(BINTARGET)/SICServer
- 
-full:	matrix/libmatrix.a hardsup/libhlib.a tecs/libtecsl.a \
-	$(BINTARGET)/SICServer
+# use this target when some of the libraries SUBLIBS might be incomplete
+full:	purge SICServer
 
-$(BINTARGET)/SICServer: $(SOBJ) $(MOTOROBJ) $(COUNTEROBJ) \
-                        $(DMCOBJ) $(VELOOBJ) $(DIFIL) $(EXTRA) \
+SICServer: $(SOBJ) $(MOTOROBJ) $(COUNTEROBJ) \
+                        $(VELOOBJ) $(DIFIL) $(EXTRA) \
                         $(SUBLIBS)
 	$(CC) -g  -o SICServer \
-	         $(SOBJ) $(MOTOROBJ) $(COUNTEROBJ) $(DMCOBJ) \
+	         $(SOBJ) $(MOTOROBJ) $(COUNTEROBJ) \
         	 $(VELOOBJ) $(DIFOBJ) $(EXTRA) $(LIBS)
-	cp SICServer $(BINTARGET)/
 
 matrix/libmatrix.a:
 	cd matrix; make $(MFLAGS) libmatrix.a
 
-hardsup/libhlib.a:
-	cd hardsup; make $(MFLAGS) libhlib.a
+psi/hardsup/libhlib.a:
+	cd psi/hardsup; make $(MFLAGS) libhlib.a
 
-tecs/libtecsl.a:
-	cd tecs; make $(MFLAGS) libtecsl.a
+psi/tecs/libtecsl.a:
+	cd psi/tecs; make $(MFLAGS) libtecsl.a
+
+psi/libpsi.a:
+	cd psi; make $(MFLAGS) libpsi.a
+
+purge:
+	rm -f SICServer $(SUBLIBS)
 
 clean:
-	rm -f *.o SICServer $(BINTARGET)/SICServer
-	cd hardsup; make $(MFLAGS) clean
+	rm -f *.o SICServer
+	cd psi/hardsup; make $(MFLAGS) clean
 	cd matrix; make $(MFLAGS) clean
-	cd tecs; make $(MFLAGS) clean
+	cd psi/tecs; make $(MFLAGS) clean
+	cd psi; make $(MFLAGS) clean
 
 Dbg.o:  Dbg.c
 	cc -g  -I/data/koenneck/include -c Dbg.c