Changeset 5097 for trunk/MagicSoft

Timestamp:

09/17/04 11:34:13 (20 years ago)

Author:

moralejo

Message:

Simplified. Now the Mars libraries are simply used for linking, but no
Mars code is compiled by this Makefile.

File:

• trunk/MagicSoft/Simulation/Detector/Camera/Makefile (modified) (6 diffs)

trunk/MagicSoft/Simulation/Detector/Camera/Makefile

@@ -19 +19 @@
 #
 # $RCSfile: Makefile,v $
-# $Revision: 1.25 $
+# $Revision: 1.26 $
 # $Author: moralejo $ 
-# $Date: 2004-09-16 15:16:33 $
+# $Date: 2004-09-17 10:34:13 $
 #
 ##################################################################
@@ -39 +39 @@
         -I${INCLUDE_COR}  \
         -I${INCLUDE_MC}   \
-        -I${INCLUDE_EVITA}   \
-        -I${INCLUDE_EVITA_MC}   \
-        -I${INCLUDE_EVITA_RAW}   \
-        -I${INCLUDE_EVITA_BASE}   \
-        -I${INCLUDE_MARS_MGEOM}   \
         -I${INCLUDE_LONS}   \
         -I${INCLUDE_STAR}   \
@@ -49 +44 @@
         -I${INCLUDE_FADC}   \
         -I${INCLUDE_ROOT} \
-        -I${INCLUDE_CPLUS}
+        -I${INCLUDE_CPLUS} \
+        -I${INCLUDE_MARS_MBASE} \
+        -I${INCLUDE_MARS_MGEOM} \
+        -I${INCLUDE_MARS_MGUI} \
+        -I${INCLUDE_MARS_MC} \
+        -I${INCLUDE_MARS_MRAW}
 
 RANLIB  = -L${RANLIBDIR} -lranlib
@@ -59 +59 @@
 
 osf_FORLIBS = -lUfor -lfor -lutil -lots -lm 
-#linux_FORLIBS =  -lf2c -lm /usr/lib/libc.a
 linux_FORLIBS =  -lm -ldl 
-#linux_FORLIBS =  -lm -ldl -rdynamic
 generic_FORLIBS = -lm 
 
 FORLIBS = ${${SYSTEM}_FORLIBS}
+MARSLIBS = ../../../Mars/libmars.so
 
 # compilation and linking flags
@@ -71 +70 @@
 CFLAGS    = ${CXXFLAGS}
 FFLAGS    = ${CXXFLAGS}
-LIBS      = ${RANLIB} ${ROOTLIBS} ${ROOTGLIBS} ${GLIBS} \
-            ${INCLUDE_EVITA_MC}/mmc.a ${INCLUDE_EVITA_RAW}/mraw.a \
-            ${INCLUDE_EVITA_BASE}/mbase.a ${INCLUDE_MARS_MGEOM}/mgeom.a
-
-#
-#  ----->>>   Compile files related to MARS with Makefiles in their
-#             directories.
-#
-SUBDIRS = ${INCLUDE_EVITA_BASE} \
-          ${INCLUDE_EVITA_MC}   \
-          ${INCLUDE_EVITA_RAW}   \
-          ${INCLUDE_MARS_MGEOM}
-
-LIBRARIES = $(SUBDIRS:=.a)
-MRPROPERS = $(SUBDIRS:=.mrproper)
-CLEANERS  = $(SUBDIRS:=.clean)
+LIBS      = ${RANLIB} ${ROOTLIBS} ${ROOTGLIBS} ${GLIBS} ${MARSLIBS}
 
 #------------------------------------------------------------------------------
@@ -145 +129 @@
         $(CXX) $(CXXFLAGS) $(OBJS) $(LIBS) -o $@
 
-$(LIBRARIES): makefiles
-        @echo " Creating lib$@:"
-        (cd $(@:.a=);make; cd ..)
-
-$(MRPROPERS): makefiles
-        @echo " Doing Mr.Proper in $(@:.mrproper=)"
-        (cd $(@:.mrproper=); (make mrproper > /dev/null); cd ..;) 
-
-
 $(CLEANERS): makefiles
         @echo "Cleaning $(@:.clean=):"