Changeset 2728 for trunk/MagicSoft/Mars/Makefile

Timestamp:

12/20/03 13:46:17 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/Makefile

@@ -21 +21 @@
 
 #PROGRAMS = readraw merpp mars test mona status
-PROGRAMS = readraw readdaq merpp star status mars mona
+PROGRAMS = readdaq readraw merpp star status mars mona
 SOLIB    = libmars.so
 CINT     = M
@@ -63 +63 @@
 MRPROPERS = $(SUBDIRS:=.mrproper)
 CLEANERS  = $(SUBDIRS:=.clean)
+LIBS      = $(SOLIB)
 
 #------------------------------------------------------------------------------
@@ -72 +73 @@
 SRCS    = $(SRCFILES)
 HEADERS = $(SRCFILES:.cc=.h)
-OBJS    = $(SRCFILES:.cc=.o) 
+OBJS    = $(SRCFILES:.cc=.o) MCint.o
 
 ############################################################
+all: rmlib $(SOLIB) $(PROGRAMS)
+        @echo " Done. "
+        @echo " "
 
-all: rmlib $(PROGRAMS) $(SOLIB)
+static: LIBS=$(SUBDIRS:=/*.o) $(OBJS)
+static: rmlib $(LIBRARIES) $(PROGRAMS)
         @echo " Done. "
         @echo " "
@@ -83 +88 @@
 include Makefile.depend
 
+#
 # Use $(CXX) -v ... for a more verbose output
 #
-#
-#$(MARS_LIB)
-$(SOLIB): $(LIBRARIES) $(OBJS) $(HEADERS) MCint.o
+# ROOTGLIBS must be there - why? How can I link the libraries?
+$(SOLIB): $(LIBRARIES) $(OBJS) $(HEADERS)
         @echo " Linking $(SOLIB) ..."
-        $(CXX) $(DYNLIB) $(CXXFLAGS) $(OBJS) MCint.o $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@
+        $(CXX) $(CXXFLAGS) $(DYNLIB) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@
+#       $(CXX) $(CXXFLAGS) $(DYNLIB) $(OBJS) -Wl,--export-dynamic -Llib $(LIBRARIES:%.a=-l%) -o $@
 
-$(PROGRAMS): $(SOLIB) $(PROGRAMS:=.o)
+$(PROGRAMS): $(LIBS) $(PROGRAMS:=.o)
         @echo " Linking $@ ..." 
-        $(CXX) $(CXXFLAGS) $(ROOTGLIBS) $(SOLIB) $@.o $(MARS_LIB) -o $@
-
-#
-# We could link mars.so instead of all libraries. This would need
-# some MBs less space on the HD. But this means, that the Shared
-# Library Path in your system must be set properly to be able to start
-# 'mars'
-#
-#$(PROGRAMS): $(LIBRARIES) $(OBJS) $(HEADERS) $(SOLIB) MCint.o $(PROGRAMS:=.o) 
-#       @echo " Linking $@ ..." 
-#       $(CXX) $(CXXFLAGS) $@.o $(OBJS) lib/$(SOLIB)  MCint.o $(ROOTGLIBS) -o $@
-
-#
-# For later use
-#
-#$(PROGRAMS): $(LIBRARIES) $(OBJS) $(HEADERS) MCint.o $(PROGRAMS:=.o) 
-#       @echo " Linking $@ ..." 
-#       $(CXX) $(CXXFLAGS) $@.o $(OBJS) $(MARS_LIB) -L/usr/X11R6/lib -lX11 -lXpm MCint.o $(ROOTGLIBS) -o $@
-#
-#$(SOLIB): $(LIBRARIES) $(OBJS) $(HEADERS) MCint.o
-#       @echo " Linking $(SOLIB) ..."
-#       $(CXX) -shared $(CXXFLAGS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@
-#       mv mars.so lib
+        $(CXX) $(CXXFLAGS) $(ROOTGLIBS) $(LIBS) $@.o $(MARS_LIB) -o $@
 
 $(LIBRARIES):
         @echo " Creating lib$@:"
         (cd $*; make; cd ..; mv $*/$@ lib/lib$@)
-#       (cd $(@:lib/lib%.a=%); make; cd ..; mv $(@:lib/lib%.a=%)/$(@:lib/lib%=%) $@)
 
 $(MRPROPERS):