Changeset 4033 for trunk

Timestamp:

05/10/04 05:29:11 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/Makefile (modified) (2 diffs)

trunk/MagicSoft/Mars/Makefile

@@ -101 +101 @@
 # 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
-ifndef ($DYFLAG)
-ifeq  ($DYFLAG,)
+ifneq ($(OSTYPE),'darwin')
 $(PROGRAMS): $(SOLIB) $(PROGRAMS:=.o)
-        @echo " Linking excutable $@ ..." 
+        @echo " Linking $@ ..." 
         $(CXX) $(CXXFLAGS) $(ROOTGLIBS) $(SOLIB) $@.o $(MARS_LIB) -o $@
-endif
-endif
-
-ifdef ($DYFLAG)
-ifneq ($DYFLAG,)
+else
 $(DYLIB): $(LIBRARIES) $(OBJS) $(HEADERS)
         @echo " Linking dylib $(DYLIB) ..."
@@ -118 +113 @@
         @echo " Linking mac executable $@ ..." 
         $(CXX) $(CXXFLAGS) $(ROOTGLIBS) $(DYLIB) $@.o $(MARS_LIB) -o $@
-endif
 endif