Changeset 9417 for trunk/MagicSoft

Timestamp:

03/31/09 23:05:33 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy

Files:

• Changelog (modified) (1 diff)
• Makefile (modified) (1 diff)
• base/BaseIncl.h (deleted)
• base/BaseLinkDef.h (deleted)
• base/CosyBaseDep.d (added)
• base/Makefile (modified) (1 diff)
• gui/Makefile (modified) (1 diff)

trunk/MagicSoft/Cosy/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
 
+ 2009/04/01 Thomas Bretz
+
+   * Makefile:
+     - changed the linking 
+
+   * base/Makefile:
+     - changed name of Base to CosyBase (trouble with the same naming
+       in Mars)
+
+   * gui/Makefile
+     - changed name of Gui to CosyGui (trouble with the same naming
+       in Mars)
+
+
+ 
  2009/01/14 Thomas Bretz
 

trunk/MagicSoft/Cosy/Makefile

@@ -78 +78 @@
 # Use $(CXX) -v ... for a more verbose output
 #
-$(SOLIB): $(LIBRARIES) $(OBJS) $(HEADERS) $(MARS_LIB)
+$(SOLIB): $(LIBRARIES) $(OBJS) $(HEADERS)
         @echo " Linking shared object $(SOLIB) ..."
-        $(CXX) $(CXXFLAGS) $(SOFLAG) $(OBJS) $(MARS_LIB) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@
+        $(CXX) $(CXXFLAGS) $(SOFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@
 
-$(PROGRAMS): $(PROGRAMS:=.o) $(SOLIB)
+$(PROGRAMS): $(PROGRAMS:=.o) $(SOLIB) $(MARS_LIB)
         @echo " Linking $@ ..." 
-        $(CXX) $(CXXFLAGS) $(ROOTGLIBS) $(SOLIB) $@.o -o $@
+        $(CXX) $(CXXFLAGS) $(ROOTGLIBS) $(SOLIB) $(MARS_LIB) $@.o -o $@
+#       $(CXX) $(CXXFLAGS) $(ROOTGLIBS) $(SUBDIRS:=/*.o) ../Mars/*/*.o $@.o -o $@
 
 rmcondor:

trunk/MagicSoft/Cosy/base/Makefile

@@ -12 +12 @@
 INCLUDES = -I. -I.. -I../mars
 
-CINT     = Base
+CINT     = CosyBase
 
 #------------------------------------------------------------------------------

trunk/MagicSoft/Cosy/gui/Makefile

@@ -14 +14 @@
            -I../mars
 
-CINT     = Gui
+CINT     = CosyGui
 
 #------------------------------------------------------------------------------