Changeset 4024 for trunk

Timestamp:

05/10/04 02:46:51 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Makefile (modified) (2 diffs)
• Makefile.conf.darwin (modified) (1 diff)

trunk/MagicSoft/Mars/Makefile

@@ -22 +22 @@
 #PROGRAMS = readraw merpp mars test mona status
 PROGRAMS = readdaq readraw merpp star status mars mona
-DYLIB    = libmars.so
+SOLIB    = libmars.so
 CINT     = M
 
@@ -98 +98 @@
         @echo " Linking $(SOLIB) ..."
         $(CXX) $(CXXFLAGS) $(SOFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -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)
+ifdef DYFLAG
         @echo " Linking $(DYLIB) ..."
-        $(CXX) $(CXXFLAGS) $(DYFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@
+        $(CXX) $(CXXFLAGS) $(DYFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $(@:.so=.dylib)
+endif
 
-$(PROGRAMS): $(DYLIB) $(PROGRAMS:=.o)
+$(PROGRAMS): $(SOLIB) $(PROGRAMS:=.o)
         @echo " Linking $@ ..." 
-        $(CXX) $(CXXFLAGS) $(ROOTGLIBS) $(DYLIB) $@.o $(MARS_LIB) -o $@
+        $(CXX) $(CXXFLAGS) $(ROOTGLIBS) $(SOLIB) $@.o $(MARS_LIB) -o $@
 
 dox: $(SOLIB)

trunk/MagicSoft/Mars/Makefile.conf.darwin

@@ -30 +30 @@
 DYFLAG   = -dynamiclib
 
-SOLIB    = $(DYLIB:.so=.dylib)
-
 # For debugging information use '-g'
 # For producing gmon.out use    '-pg'