- Timestamp:
- 05/09/04 19:17:11 (21 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r4019 r4020 18 18 19 19 -*-*- 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 20 35 21 36 2004/05/08: Thomas Bretz -
trunk/MagicSoft/Mars/Makefile
r3998 r4020 97 97 $(SOLIB): $(LIBRARIES) $(OBJS) $(HEADERS) 98 98 @echo " Linking $(SOLIB) ..." 99 $(CXX) $(CXXFLAGS) $( DYNLIB) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@99 $(CXX) $(CXXFLAGS) $(SOFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@ 100 100 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) 102 108 @echo " Linking $@ ..." 103 $(CXX) $(CXXFLAGS) $(ROOTGLIBS) $( SOLIB) $@.o $(MARS_LIB) -o $@109 $(CXX) $(CXXFLAGS) $(ROOTGLIBS) $(DYLIB) $@.o $(MARS_LIB) -o $@ 104 110 105 111 dox: $(SOLIB) -
trunk/MagicSoft/Mars/Makefile.conf.darwin
r2491 r4020 24 24 DEBUG = 25 25 ARCHDEF = -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) 29 SOFLAG = -bundle 30 DYFLAG = -dynamiclib 31 32 DYLIB = $(SOLIB:.so=.dylib) 27 33 28 34 # For debugging information use '-g' … … 35 41 # uncomment this for quiet compilation 36 42 37 .SILENT:43 #.SILENT: 38 44 39 45 # @endcode -
trunk/MagicSoft/Mars/Makefile.conf.general
r3927 r4020 18 18 # export MARSLIBS="-lX11 -lXpm -L/usr/X11R6/lib" 19 19 # 20 DEFINES 20 DEFINES = -DMARSVER=\"\<cvs\>\" -D__MARS__ -DROOTVER=\"$(ROOTVER)\" $(ARCHDEF) $(MARSDEFINES) 21 21 22 CXXFLAGS 23 CFLAGS 24 FFLAGS 22 CXXFLAGS = $(ROOTCFLAGS) $(INCLUDES) $(OPTIM) $(DEBUG) $(DEFINES) 23 CFLAGS = $(CXXFLAGS) $(MARSFLAGS) 24 FFLAGS = $(CXXFLAGS) 25 25 26 HEADERS = $($(subst .cxx,.cc,SRCFILES):.cc=.h)27 OBJS = $($(subst .cxx,.cc,SRCFILES):.cc=.o) $(CINT)Cint.o26 HEADERS = $($(subst .cxx,.cc,SRCFILES):.cc=.h) 27 OBJS = $($(subst .cxx,.cc,SRCFILES):.cc=.o) $(CINT)Cint.o -
trunk/MagicSoft/Mars/Makefile.conf.linux
r3965 r4020 21 21 DEBUG = 22 22 ARCHDEF = -D__LINUX__ 23 DYNLIB = -shared 23 SOFLAG = -shared 24 25 DYLIB = $(SOLIB) 24 26 25 27 # For debugging information use '-g' -
trunk/MagicSoft/Mars/Makefile.rules
r3927 r4020 68 68 rmbin: 69 69 @echo " Removing binary files..." 70 @rm -f $(PROGRAMS) $(SOLIB) so_locations70 @rm -f $(PROGRAMS) $(SOLIB) $(DYLIB) so_locations 71 71 72 72 rmbak:
Note:
See TracChangeset
for help on using the changeset viewer.