Index: trunk/MagicSoft/Simulation/Detector/Camera/Makefile
===================================================================
--- trunk/MagicSoft/Simulation/Detector/Camera/Makefile	(revision 5103)
+++ trunk/MagicSoft/Simulation/Detector/Camera/Makefile	(revision 5104)
@@ -19,7 +19,7 @@
 #
 # $RCSfile: Makefile,v $
-# $Revision: 1.26 $
+# $Revision: 1.27 $
 # $Author: moralejo $ 
-# $Date: 2004-09-17 10:34:13 $
+# $Date: 2004-09-17 15:44:43 $
 #
 ##################################################################
@@ -121,5 +121,5 @@
 ############################################################
 
-all: rmlib rmtrig $(PROGRAM) 
+all: $(PROGRAM) 
 	@echo " Done. "
 	@echo " "
@@ -132,11 +132,6 @@
 	@echo "Cleaning $(@:.clean=):"
 	(cd $(@:.clean=); make clean; cd ..;) 
-rmtrig:
-	@echo " Removing ..."
-	@echo " "
-	@rm -f ${INCLUDE_TRIGGER}/*.o
-
-depend: rmtrig
-	@makedepend $(SRCS) $(INCLUDES) -fMakefile 2> kk.kk ; cat kk.kk
+
+depend: @makedepend $(SRCS) $(INCLUDES) -fMakefile 2> kk.kk ; cat kk.kk
 
 doc: camera-doc
@@ -196,9 +191,4 @@
 	@rm -f *Cint.*
 
-rmlib:	
-	@echo " Removing libraries..."
-	@echo " "
-	@rm -f lib/lib*.a lib*.a
-
 rmobjs:	
 	@echo " Removing object files..."
Index: trunk/MagicSoft/Simulation/Detector/StarResponse/Makefile
===================================================================
--- trunk/MagicSoft/Simulation/Detector/StarResponse/Makefile	(revision 5103)
+++ trunk/MagicSoft/Simulation/Detector/StarResponse/Makefile	(revision 5104)
@@ -19,7 +19,7 @@
 #
 # $RCSfile: Makefile,v $
-# $Revision: 1.7 $
+# $Revision: 1.8 $
 # $Author: moralejo $ 
-# $Date: 2004-09-17 13:51:01 $
+# $Date: 2004-09-17 15:44:44 $
 #
 ##################################################################
@@ -68,5 +68,5 @@
 # compilation and linking flags
 
-CXXFLAGS  = -D__${SYSTEM}__ -D__STARRESPO__ ${INCLUDES} ${OPTIM} ${DEBUG}
+CXXFLAGS  = -D__${SYSTEM}__ ${INCLUDES} ${OPTIM} ${DEBUG}
 CFLAGS    = ${CXXFLAGS}
 FFLAGS    = ${CXXFLAGS}
@@ -113,5 +113,5 @@
 ############################################################
 
-all: rmtrig $(PROGRAM) 
+all: $(PROGRAM) 
 	@echo " Done. "
 	@echo " "
@@ -121,9 +121,5 @@
 	$(CXX) $(CXXFLAGS) $(OBJS) $(LIBS) -o $@
 
-rmtrig:
-	@rm -f ${INCLUDE_TRIGGER}/*.o
-
-depend: rmtrig
-	@makedepend $(SRCS) $(INCLUDES) -fMakefile 2> kk.kk ; cat kk.kk
+depend: @makedepend $(SRCS) $(INCLUDES) -fMakefile 2> kk.kk ; cat kk.kk
 
 .cxx.o:	
Index: trunk/MagicSoft/Simulation/Detector/include-MTrigger/MTrigger.cxx
===================================================================
--- trunk/MagicSoft/Simulation/Detector/include-MTrigger/MTrigger.cxx	(revision 5103)
+++ trunk/MagicSoft/Simulation/Detector/include-MTrigger/MTrigger.cxx	(revision 5104)
@@ -517,5 +517,4 @@
   //
   
-#ifndef __STARRESPO__
   for(i=0; i < pixnum;i++ )
     {
@@ -525,5 +524,5 @@
       }
     }
-#endif
+
   //
   //  Read in the lookup table for trigger cells