Changeset 2491 for trunk/MagicSoft/Mars/Makefile

Timestamp:

11/10/03 11:25:13 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/Makefile (modified) (7 diffs)

trunk/MagicSoft/Mars/Makefile

@@ -20 +20 @@
 #
 
-PROGRAMS = readraw merpp star mars
-SOLIB    = mars.so
+#PROGRAMS = readraw merpp mars test mona status
+PROGRAMS = readraw merpp mars
+SOLIB    = libmars.so
 CINT     = M
 
@@ -37 +38 @@
 SUBDIRS = mbase \
           mmain \
+          mfilter \
+          mdata \
+          mhist \
+          manalysis \
           mfileio \
           mreflector \
-          mhist \
           mdatacheck \
           mgeom \
           mimage \
-          manalysis \
           mmontecarlo \
           mmc \
@@ -49 +52 @@
           mgui \
           mranforest \
-          mdata \
           mhistmc \
-          mfilter \
           mtools
 
+#          monline \
+
+#LIBRARIES = $(SUBDIRS:%=lib/lib%.a)
 LIBRARIES = $(SUBDIRS:=.a)
 MRPROPERS = $(SUBDIRS:=.mrproper)
@@ -62 +66 @@
 .SUFFIXES: .c .cc .h .o 
 
-SRCFILES = 
+SRCFILES =
 
 SRCS    = $(SRCFILES)
@@ -84 +88 @@
         @echo " Linking $(SOLIB) ..."
         $(CXX) $(DYNLIB) $(CXXFLAGS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@
-        mv mars.so lib
 
-$(PROGRAMS): $(LIBRARIES) $(OBJS) $(HEADERS) MCint.o $(PROGRAMS:=.o) 
+$(PROGRAMS): $(SOLIB) $(PROGRAMS:=.o)
         @echo " Linking $@ ..." 
-        $(CXX) $(CXXFLAGS) $@.o $(OBJS) $(MARS_LIB) MCint.o $(ROOTGLIBS) -o $@
+        $(CXX) $(CXXFLAGS) $(ROOTGLIBS) $(SOLIB) $@.o $(MARS_LIB) -o $@
 
 #
@@ -114 +117 @@
 $(LIBRARIES):
         @echo " Creating lib$@:"
-        (cd $*; make; cd ..; mv $*/$@ lib/lib$@) 
+        (cd $*; make; cd ..; mv $*/$@ lib/lib$@)
+#       (cd $(@:lib/lib%.a=%); make; cd ..; mv $(@:lib/lib%.a=%)/$(@:lib/lib%=%) $@)
 
 $(MRPROPERS):
@@ -137 +141 @@
         @echo "Making tar-file"
         @root -b -q -l -n tar.C
-#       @tar cvf ../mars.tar --exclude=Root .roo trc *
+#       @tar cvf ../mars.tar --exclude=Root .rootrc *
 #       @gzip -9 ../mars.tar
 
-depend:
+Makefile.depend:
         (! find ./ Makefile.depend -maxdepth 1 -empty 2> /dev/null && \
         echo " Generating dependancies into Makefile.depend" && \
-        makedepend -- $(INCLUDES) -- $(PROGRAMS:=.cc) $(SRCS) $(SUBDIRS:=/*.cc) -f- 2> /dev/null | grep -v Cint | grep -v "/usr/" > Makefile.depend && \
+        makedepend -- $(INCLUDES) -- $(PROGRAMS:=.cc) $(SRCS) $(SUBDIRS:=/*.cc) -w1024 -f- 2> /dev/null | grep -v Cint | grep -v "/usr/" > Makefile.depend && \
         echo " ") || find -maxdepth 0 -true > /dev/null
 
-Makefile.depend: depend
+depend: Makefile.depend 
 
 # @endcode