Changeset 4020

Timestamp:

05/09/04 19:17:11 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• Makefile (modified) (1 diff)
• Makefile.conf.darwin (modified) (2 diffs)
• Makefile.conf.general (modified) (1 diff)
• Makefile.conf.linux (modified) (1 diff)
• Makefile.rules (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2004/05/09: Thomas Bretz
+
+   * Makefile:
+     - added workaround for Mac to create so- and dynlib-object
+
+   * Makefile.conf.darwin:
+     - added necessary option to create both kind of files
+
+   * Makefile.conf.linux:
+     - changed the options to create so-object only
+
+   * Makefile.rules:
+     - added DYLIB to rmbin
+
+
 
  2004/05/08: Thomas Bretz

trunk/MagicSoft/Mars/Makefile

@@ -97 +97 @@
 $(SOLIB): $(LIBRARIES) $(OBJS) $(HEADERS)
         @echo " Linking $(SOLIB) ..."
-        $(CXX) $(CXXFLAGS) $(DYNLIB) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@
+        $(CXX) $(CXXFLAGS) $(SOFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@
 
-$(PROGRAMS): $(SOLIB) $(PROGRAMS:=.o)
+# This is a special workaround to create the shared object (bundle, plugin)
+# for root and the dynlib (to be linked with the executable) on Mac OSX
+$(DYLIB): $(LIBRARIES) $(OBJS) $(HEADERS)
+        @echo " Linking $(DYLIB) ..."
+        $(CXX) $(CXXFLAGS) $(DYFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@
+
+$(PROGRAMS): $(DYLIB) $(PROGRAMS:=.o)
         @echo " Linking $@ ..." 
-        $(CXX) $(CXXFLAGS) $(ROOTGLIBS) $(SOLIB) $@.o $(MARS_LIB) -o $@
+        $(CXX) $(CXXFLAGS) $(ROOTGLIBS) $(DYLIB) $@.o $(MARS_LIB) -o $@
 
 dox: $(SOLIB)

trunk/MagicSoft/Mars/Makefile.conf.darwin

@@ -24 +24 @@
 DEBUG    = 
 ARCHDEF  = -D__LINUX__
-DYNLIB   = -dynamiclib
+
+# For Mac OSX we need to kind of shared objects. One which can be plugged
+# into root (bundle) and one which can be linked to the executables (dynlib)
+SOFLAG   = -bundle
+DYFLAG   = -dynamiclib
+
+DYLIB    = $(SOLIB:.so=.dylib)
 
 # For debugging information use '-g'
@@ -35 +41 @@
 # uncomment this for quiet compilation
 
-.SILENT:
+#.SILENT:
 
 # @endcode

trunk/MagicSoft/Mars/Makefile.conf.general

@@ -18 +18 @@
 #   export MARSLIBS="-lX11 -lXpm -L/usr/X11R6/lib"
 #
-DEFINES   = -DMARSVER=\"\<cvs\>\" -D__MARS__ -DROOTVER=\"$(ROOTVER)\" $(ARCHDEF) $(MARSDEFINES)
+DEFINES  = -DMARSVER=\"\<cvs\>\" -D__MARS__ -DROOTVER=\"$(ROOTVER)\" $(ARCHDEF) $(MARSDEFINES)
 
-CXXFLAGS  = $(ROOTCFLAGS) $(INCLUDES) $(OPTIM) $(DEBUG) $(DEFINES)
-CFLAGS    = $(CXXFLAGS) $(MARSFLAGS)
-FFLAGS    = $(CXXFLAGS)
+CXXFLAGS = $(ROOTCFLAGS) $(INCLUDES) $(OPTIM) $(DEBUG) $(DEFINES)
+CFLAGS   = $(CXXFLAGS) $(MARSFLAGS)
+FFLAGS   = $(CXXFLAGS)
 
-HEADERS = $($(subst .cxx,.cc,SRCFILES):.cc=.h)
-OBJS    = $($(subst .cxx,.cc,SRCFILES):.cc=.o) $(CINT)Cint.o
+HEADERS  = $($(subst .cxx,.cc,SRCFILES):.cc=.h)
+OBJS     = $($(subst .cxx,.cc,SRCFILES):.cc=.o) $(CINT)Cint.o

trunk/MagicSoft/Mars/Makefile.conf.linux

@@ -21 +21 @@
 DEBUG    = 
 ARCHDEF  = -D__LINUX__
-DYNLIB   = -shared
+SOFLAG   = -shared
+
+DYLIB    = $(SOLIB)
 
 # For debugging information use '-g'

trunk/MagicSoft/Mars/Makefile.rules

@@ -68 +68 @@
 rmbin:  
         @echo " Removing binary files..."
-        @rm -f $(PROGRAMS) $(SOLIB) so_locations
+        @rm -f $(PROGRAMS) $(SOLIB) $(DYLIB) so_locations
 
 rmbak: