Changeset 17246 for trunk

Timestamp:

10/18/13 13:25:32 (11 years ago)

Author:

tbretz

Message:

Use LINKER so that we can compiler with colorgcc

File:

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

trunk/Mars/Makefile

@@ -99 +99 @@
 SRCFILES = \
            mcore/izstream.h \
-           mcore/ofits.h \
+           mcore/factofits.h \
            mcore/factfits.h \
            mcore/DrsCalib.h \
@@ -126 +126 @@
 $(SOLIB): $(LIBRARIES) $(OBJS) $(HEADERS)
         @echo " Linking shared object $@ ..."
-        $(CXX) $(CXXFLAGS) $(SOFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) $(LIBNOVA) -o ${RNDMNAME}
+        $(LINKER) $(CXXFLAGS) $(SOFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) $(LIBNOVA) -o ${RNDMNAME}
         mv ${RNDMNAME} $@
         chmod go+r $@
@@ -135 +135 @@
 $(PROGRAMS): $(PROGRAMS:=.o) $(SOLIB)
         @echo " Linking $@ ..." 
-        $(CXX) $(CXXFLAGS) $@.o $(MARS_LIB) $(SOLIB) $(ROOTGLIBS) -o $@
+        $(LINKER) $(CXXFLAGS) $@.o $(MARS_LIB) $(SOLIB) $(ROOTGLIBS) -o $@
 
 # Use this to link the programs statically - for gprof
@@ -144 +144 @@
 $(DYLIB): $(LIBRARIES) $(OBJS) $(HEADERS)
         @echo " Linking dylib $(DYLIB) ..."
-        $(CXX) $(CXXFLAGS) $(DYFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@
+        $(LINKER) $(CXXFLAGS) $(DYFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@
 
 $(PROGRAMS): $(PROGRAMS:=.o) $(DYLIB)
         @echo " Linking mac executable $@ ..." 
-        $(CXX) $(CXXFLAGS) $(ROOTGLIBS) $(DYLIB) $@.o $(MARS_LIB) -o $@
+        $(LINKER) $(CXXFLAGS) $(ROOTGLIBS) $(DYLIB) $@.o $(MARS_LIB) -o $@
 endif