Changeset 15179

Timestamp:

03/29/13 17:15:12 (12 years ago)

Author:

tbretz

Message:

Added nova-path to get nova wrapper compiled.

File:

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

trunk/Mars/Makefile

@@ -80 +80 @@
           mmuon
 
+LIBNOVA_PATH := `which libnovaconfig`
+
+ifeq ($(shell basename "$(LIBNOVA_PATH)X"), libnovaconfigX)
+SUBDIRS += nova
+endif
+
 #LIBRARIES = $(SUBDIRS:%=lib/lib%.a)
 LIBRARIES := $(SUBDIRS:=.a)
@@ -112 +118 @@
 # ROOTGLIBS must be there - why? How can I link the libraries?
 $(SOLIB): $(LIBRARIES) $(OBJS) $(HEADERS)
-        @echo " Linking shared object $(SOLIB) ..."
-        $(CXX) $(CXXFLAGS) $(SOFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o ${RNDMNAME}
+        @echo " Linking shared object $@ ..."
+        $(CXX) $(CXXFLAGS) $(SOFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) $(LIBNOVA) -o ${RNDMNAME}
         mv ${RNDMNAME} $@
         chmod go+r $@