Changeset 546 for trunk/MagicSoft


Ignore:
Timestamp:
01/17/01 17:28:21 (24 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Makefile

    r543 r546  
    3737SUBDIRS = mgui mdatacheck mbase mraw
    3838
    39 #
    40 # Library rules
    41 #
    42 MARS_LIB  = -Llib $(SUBDIRS:%=-l%)
    43 MARS_LIBB = $(SUBDIRS:%=lib%.a)
    44 INCLUDES  = -I. $(SUBDIRS:%=-I%)
    45 
     39LIBRARIES = $(SUBDIRS:=.a)
    4640
    4741#------------------------------------------------------------------------------
    … …  
    6054
    6155# Use $(CXX) -v ... for a more verbose output
    62 $(PROGRAMS): $(MARS_LIBB) $(PROGRAMS:=.o) $(OBJS) MCint.o
     56$(PROGRAMS): $(LIBRARIES) $(OBJS) MCint.o $(PROGRAMS:=.o)
    6357        @echo " Linking $@ ..."
    6458        $(CXX) $(CXXFLAGS) $@.o $(OBJS) $(MARS_LIB) MCint.o $(ROOTGLIBS) -o $@
    6559
    66 $(SOLIB): $(OBJS) $(MARS_LIBB) MCint.o
     60$(SOLIB): $(LIBRARIES) $(OBJS) MCint.o
    6761        @echo " Linking $(SOLIB) ..."
    68         $(CXX) -shared $(CXXFLAGS) $(SUBDIRS:%=%/*.o) $(ROOTGLIBS) -o $@
     62        $(CXX) -shared $(CXXFLAGS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@
    6963        mv mars.so lib
    7064
    71 $(MARS_LIBB):
    72         @echo " Creating $@:"
    73         (cd $(@:lib%.a=%); make; cd ..; mv $(@:lib%.a=%)/$@ lib)
     65$(LIBRARIES):
     66        @echo " Creating lib$@:"
     67        (cd $*; make; cd ..; mv $*/$@ lib/lib$@)
    7468
    7569dox:
    7670        @echo " Creating html documentation:"
    7771        root -b -q dohtml.C
    78 
    7972
    8073include Makefile.rules

  • trunk/MagicSoft/Mars/Makefile.conf.linux-gnu

    r545 r546  
    2323DEBUG    = -g
    2424
     25MARS_LIB  = -Llib $(SUBDIRS:%=-l%)
     26INCLUDES  = -I. $(SUBDIRS:%=-I%)
     27
    2528# uncomment this for quiet compilation
    2629

  • trunk/MagicSoft/Mars/Makefile.conf.osf1

    r463 r546  
    1111
    1212#
    13 #  ----->>>  includes
    14 #
    15 
    16 INCLUDE_ROOT    = $(ROOTSYS)/include
    17 INCLUDE_CPLUS   = /usr/include/cxx
    18 
    19 #
    2013# compilers
    2114#
    2215
    23 CC            = cc
    24 CXX           = cxx
    25 F77           = f77
    26 AR            = ar -c -r
     16CC  = cc
     17CXX = cxx
     18F77 = f77
     19AR  = ar -c -r
    2720
    2821#
    … …  
    3023#
    3124
    32 OPTIM    = -O2 -ieee -arch host
    33 DEBUG    = -g
     25OPTIM = -O2 -ieee -arch host
     26DEBUG = -g
     27
     28MARS_LIB  = -Llib $(SUBDIRS/*/-l&)
     29INCLUDES  = -I. $(SUBDIRS/*/-I&)
    3430
    3531# uncomment this for quiet compilation

  • trunk/MagicSoft/Mars/Makefile.rules

    r466 r546  
    55
    66$(LIB): $(OBJS) $(CINT)Cint.o
    7         @echo " - Building Library $(LIB) ... "
     7        @echo " - Building Library lib$(LIB) ... "
    88        $(AR) $(LIB) *.o
    99

  • trunk/MagicSoft/Mars/mbase/Makefile

    r466 r546  
    2525
    2626CINT     = Base
    27 LIB      = libmbase.a
     27LIB      = mbase.a
    2828
    2929#------------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mdatacheck/Makefile

    r462 r546  
    2222# @code
    2323
    24 LIB   = libmdatacheck.a
     24LIB   = mdatacheck.a
    2525
    2626#

  • trunk/MagicSoft/Mars/mgui/Makefile

    r461 r546  
    2222# @code
    2323
    24 LIB   = libmgui.a
     24LIB   = mgui.a
    2525
    2626#

  • trunk/MagicSoft/Mars/mraw/Makefile

    r466 r546  
    1717# Library name to creatre
    1818#
    19 LIB   = libmraw.a
     19LIB   = mraw.a
    2020
    2121#
Note: See TracChangeset for help on using the changeset viewer.