Changeset 4031 for trunk

Timestamp:

05/10/04 05:24:18 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/Makefile

@@ -96 +96 @@
 # ROOTGLIBS must be there - why? How can I link the libraries?
 $(SOLIB): $(LIBRARIES) $(OBJS) $(HEADERS)
-        @echo " Linking $(SOLIB) ..."
+        @echo " Linking shared object $(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
-ifneq ($DYFLAG,'')
+ifndef ($DYFLAG)
+ifneq  ($DYFLAG,)
+$(PROGRAMS): $(SOLIB) $(PROGRAMS:=.o)
+        @echo " Linking excutable $@ ..." 
+        $(CXX) $(CXXFLAGS) $(ROOTGLIBS) $(SOLIB) $@.o $(MARS_LIB) -o $@
+endif
+endif
+
+ifdef ($DYFLAG)
+ifeq ($DYFLAG,)
 $(DYLIB): $(LIBRARIES) $(OBJS) $(HEADERS)
-        @echo " Linking $(DYLIB) ..."
+        @echo " Linking dylib $(DYLIB) ..."
         $(CXX) $(CXXFLAGS) $(DYFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@
 
 $(PROGRAMS): $(DYLIB) $(PROGRAMS:=.o)
-        @echo " Linking $@ ..." 
+        @echo " Linking mac executable $@ ..." 
         $(CXX) $(CXXFLAGS) $(ROOTGLIBS) $(DYLIB) $@.o $(MARS_LIB) -o $@
-else
-$(PROGRAMS): $(SOLIB) $(PROGRAMS:=.o)
-        @echo " Linking $@ ..." 
-        $(CXX) $(CXXFLAGS) $(ROOTGLIBS) $(SOLIB) $@.o $(MARS_LIB) -o $@
+endif
 endif