diff --git a/make_gen b/make_gen
index 45ac77ca..704b21d4 100644
--- a/make_gen
+++ b/make_gen
@@ -47,6 +47,8 @@ MOTOROBJ = motor.o  simdriv.o
 COUNTEROBJ =  countdriv.o simcter.o counter.o
 VELOOBJ    = velo.o velosim.o 
 
+OBJ = $(SOBJ) $(MOTOROBJ) $(COUNTEROBJ) $(VELOOBJ) $(DIFIL) $(EXTRA)
+
 .SUFFIXES:
 .SUFFIXES: .tcl .htm .c .o .tc
 
@@ -61,12 +63,8 @@ all:	libmat libhlib libtecsl libpsi SICServer
 # use this target when some of the libraries SUBLIBS might be incomplete
 full:	purge all
 
-SICServer: $(SOBJ) $(MOTOROBJ) $(COUNTEROBJ) \
-                        $(VELOOBJ) $(DIFIL) $(EXTRA) \
-                        $(SUBLIBS)
-	$(CC) -g -o SICServer \
-	         $(SOBJ) $(MOTOROBJ) $(COUNTEROBJ) \
-        	 $(VELOOBJ) $(DIFOBJ) $(EXTRA) $(LIBS)
+SICServer: $(OBJ) $(SUBLIBS)
+	$(CC) -g -o SICServer $(OBJ) $(LIBS)
 
 matrix/libmatrix.a: libmat
 
@@ -92,7 +90,7 @@ purge:
 	rm -f SICServer $(SUBLIBS)
 
 clean:
-	rm -f *.o SICServer
+	rm -f *.o *.d SICServer
 	cd psi/hardsup; make $(MFLAGS) clean
 	cd matrix; make $(MFLAGS) clean
 	cd psi/tecs; make $(MFLAGS) clean