Changeset 4020 for trunk


Ignore:
Timestamp:
05/09/04 19:17:11 (21 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r4019 r4020  
    1818
    1919                                                 -*-*- END OF LINE -*-*-
     20 2004/05/09: Thomas Bretz
     21
     22   * Makefile:
     23     - added workaround for Mac to create so- and dynlib-object
     24
     25   * Makefile.conf.darwin:
     26     - added necessary option to create both kind of files
     27
     28   * Makefile.conf.linux:
     29     - changed the options to create so-object only
     30
     31   * Makefile.rules:
     32     - added DYLIB to rmbin
     33
     34
    2035
    2136 2004/05/08: Thomas Bretz
  • trunk/MagicSoft/Mars/Makefile

    r3998 r4020  
    9797$(SOLIB): $(LIBRARIES) $(OBJS) $(HEADERS)
    9898        @echo " Linking $(SOLIB) ..."
    99         $(CXX) $(CXXFLAGS) $(DYNLIB) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@
     99        $(CXX) $(CXXFLAGS) $(SOFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@
    100100
    101 $(PROGRAMS): $(SOLIB) $(PROGRAMS:=.o)
     101# This is a special workaround to create the shared object (bundle, plugin)
     102# for root and the dynlib (to be linked with the executable) on Mac OSX
     103$(DYLIB): $(LIBRARIES) $(OBJS) $(HEADERS)
     104        @echo " Linking $(DYLIB) ..."
     105        $(CXX) $(CXXFLAGS) $(DYFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@
     106
     107$(PROGRAMS): $(DYLIB) $(PROGRAMS:=.o)
    102108        @echo " Linking $@ ..."
    103         $(CXX) $(CXXFLAGS) $(ROOTGLIBS) $(SOLIB) $@.o $(MARS_LIB) -o $@
     109        $(CXX) $(CXXFLAGS) $(ROOTGLIBS) $(DYLIB) $@.o $(MARS_LIB) -o $@
    104110
    105111dox: $(SOLIB)
  • trunk/MagicSoft/Mars/Makefile.conf.darwin

    r2491 r4020  
    2424DEBUG    =
    2525ARCHDEF  = -D__LINUX__
    26 DYNLIB   = -dynamiclib
     26
     27# For Mac OSX we need to kind of shared objects. One which can be plugged
     28# into root (bundle) and one which can be linked to the executables (dynlib)
     29SOFLAG   = -bundle
     30DYFLAG   = -dynamiclib
     31
     32DYLIB    = $(SOLIB:.so=.dylib)
    2733
    2834# For debugging information use '-g'
     
    3541# uncomment this for quiet compilation
    3642
    37 .SILENT:
     43#.SILENT:
    3844
    3945# @endcode
  • trunk/MagicSoft/Mars/Makefile.conf.general

    r3927 r4020  
    1818#   export MARSLIBS="-lX11 -lXpm -L/usr/X11R6/lib"
    1919#
    20 DEFINES   = -DMARSVER=\"\<cvs\>\" -D__MARS__ -DROOTVER=\"$(ROOTVER)\" $(ARCHDEF) $(MARSDEFINES)
     20DEFINES  = -DMARSVER=\"\<cvs\>\" -D__MARS__ -DROOTVER=\"$(ROOTVER)\" $(ARCHDEF) $(MARSDEFINES)
    2121
    22 CXXFLAGS  = $(ROOTCFLAGS) $(INCLUDES) $(OPTIM) $(DEBUG) $(DEFINES)
    23 CFLAGS    = $(CXXFLAGS) $(MARSFLAGS)
    24 FFLAGS    = $(CXXFLAGS)
     22CXXFLAGS = $(ROOTCFLAGS) $(INCLUDES) $(OPTIM) $(DEBUG) $(DEFINES)
     23CFLAGS   = $(CXXFLAGS) $(MARSFLAGS)
     24FFLAGS   = $(CXXFLAGS)
    2525
    26 HEADERS = $($(subst .cxx,.cc,SRCFILES):.cc=.h)
    27 OBJS    = $($(subst .cxx,.cc,SRCFILES):.cc=.o) $(CINT)Cint.o
     26HEADERS  = $($(subst .cxx,.cc,SRCFILES):.cc=.h)
     27OBJS     = $($(subst .cxx,.cc,SRCFILES):.cc=.o) $(CINT)Cint.o
  • trunk/MagicSoft/Mars/Makefile.conf.linux

    r3965 r4020  
    2121DEBUG    =
    2222ARCHDEF  = -D__LINUX__
    23 DYNLIB   = -shared
     23SOFLAG   = -shared
     24
     25DYLIB    = $(SOLIB)
    2426
    2527# For debugging information use '-g'
  • trunk/MagicSoft/Mars/Makefile.rules

    r3927 r4020  
    6868rmbin: 
    6969        @echo " Removing binary files..."
    70         @rm -f $(PROGRAMS) $(SOLIB) so_locations
     70        @rm -f $(PROGRAMS) $(SOLIB) $(DYLIB) so_locations
    7171
    7272rmbak:
Note: See TracChangeset for help on using the changeset viewer.