Changeset 4920

Timestamp:

Jan 8, 2015, 5:21:02 AM (5 years ago)

Author:

ldelgass

Message:

Don't build newmat11 matrix library unless point set renderer is included

File:

• nanovis/branches/1.1/Makefile.in (modified) (5 diffs)

nanovis/branches/1.1/Makefile.in

@@ -67 +67 @@
 LIBS            = \
                 $(RP_LIB_SPEC) \
-                $(GRAPHICS_LIB_SPEC) \
-                $(IMG_LIB_SPEC) \
-                $(MAT_LIB_SPEC) \
-                $(UTIL_LIB_SPEC) \
-                $(VRMATH_LIB_SPEC) \
                 $(TCL_LIB_SPEC) \
                 $(CG_LIB_SPEC) \
@@ -78 +73 @@
                 -Wl,-rpath,$(LD_RUN_PATH)
 
+STATIC_LIBS     = \
+                $(GRAPHICS_LIB) \
+                $(IMG_LIB) \
+                $(UTIL_LIB) \
+                $(VRMATH_LIB)
+
 INCLUDES        = \
                 -I. \
                 -I$(srcdir) \
                 $(IMG_INC_SPEC) \
-                $(MAT_INC_SPEC) \
                 $(VRMATH_INC_SPEC) \
                 $(TCL_INC_SPEC) \
@@ -192 +192 @@
                 PointSetRenderer.o \
                 PointShader.o
-
+STATIC_LIBS +=  $(MAT_LIB)
+INCLUDES +=     $(MAT_INC_SPEC)
 shaders +=      $(srcdir)/shaders/pointsvp.cg
 endif
@@ -198 +199 @@
 .PHONY: all install install-resources install-shaders install-nanovis docs clean-docs clean distclean graphics imgloaders newmat11 util vrmath
 
-all: newmat11 graphics imgloaders util vrmath nanovis 
+all: nanovis 
 
 install: install-nanovis install-resources install-shaders
@@ -227 +228 @@
         $(MAKE) -C $(VRMATH_DIR) all
 
-nanovis: $(MAT_LIB) $(GRAPHICS_LIB) $(IMG_LIB) $(UTIL_LIB) $(VRMATH_LIB) $(OBJS)
+nanovis: $(OBJS) $(STATIC_LIBS)
         $(CXX) $(CXX_SWITCHES) -o $@ $^ $(LIBS)