Changeset 4025 for trunk

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/Makefile

@@ -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
 ifdef DYFLAG
-        @echo " Linking $(DYLIB) ..."
-        $(CXX) $(CXXFLAGS) $(DYFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $(@:.so=.dylib)
-endif
+$(DYLIB): $(LIBRARIES) $(OBJS) $(HEADERS)
+        @echo " Linking $(SOLIB) ..."
+        $(CXX) $(CXXFLAGS) $(DYFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@
 
+$(PROGRAMS): $(DYLIB) $(PROGRAMS:=.o)
+        @echo " Linking $@ ..." 
+        $(CXX) $(CXXFLAGS) $(ROOTGLIBS) $(DYLIB) $@.o $(MARS_LIB) -o $@
+else
 $(PROGRAMS): $(SOLIB) $(PROGRAMS:=.o)
         @echo " Linking $@ ..." 
         $(CXX) $(CXXFLAGS) $(ROOTGLIBS) $(SOLIB) $@.o $(MARS_LIB) -o $@
+endif        
 
 dox: $(SOLIB)