Changeset 1359 for trunk/packages/vizservers/nanovis/Makefile.in

Timestamp:

Mar 21, 2009 4:17:22 PM (15 years ago)

Author:

gah

Message:

preparation to remove glui from build

File:

• trunk/packages/vizservers/nanovis/Makefile.in (modified) (5 diffs)

trunk/packages/vizservers/nanovis/Makefile.in

@@ -53 +53 @@
 R2_LIB_SPEC     = $(R2_LIB)
 
-GLUI_DIR          = ./glui
-GLUI_INC_SPEC     = -I$(srcdir)/$(GLUI_DIR)
-GLUI_LIB          = $(GLUI_DIR)/libglui.a
-GLUI_LIB_SPEC     = $(GLUI_LIB)
-
-
 EXTRA_LIBS      = -lm -lpthread
 RP_DIR          =  @RP_DIR@
 RP_INC_SPEC     = -I$(RP_DIR)/include -I$(RP_DIR)/include/rappture2
 RP_LIB_SPEC     = -L$(RP_DIR)/lib -lrappture2 -lrappture -lexpat -lz
-
-TF_DIR          = ./transfer-function
-TF_INC_SPEC     = -I$(TF_DIR)
-TF_LIB          = $(TF_DIR)/transfer-function.a
-TF_LIB_SPEC     = $(TF_LIB)
 
 TCL_LIB_SPEC    = @TCL_LIB_SPEC@
@@ -79 +68 @@
                 $(IMG_LIB_SPEC) \
                 $(R2_LIB_SPEC) \
-                $(TF_LIB_SPEC) \
                 $(MAT_LIB_SPEC) \
                 $(TCL_LIB_SPEC) \
@@ -194 +182 @@
 install: install-nanovis install-resources install-shaders
 
-glui:                   $(GLUI_LIB)
 newmat11:               $(MAT_LIB)
 R2:                     $(R2_LIB)
 imgloaders:             $(IMG_LIB)
-transfer-function:      $(TF_LIB)
-
-$(GLUI_LIB):
-        $(MAKE) -C $(GLUI_DIR) all
 
 $(MAT_LIB):
@@ -212 +195 @@
         $(MAKE) -C $(IMG_DIR) all
 
-$(TF_LIB): 
-        $(MAKE) -C $(TF_DIR) all
-
-nanovis: $(MAT_LIB) $(R2_LIB) $(IMG_LIB) $(TF_LIB) $(OBJS)
+nanovis: $(MAT_LIB) $(R2_LIB) $(IMG_LIB) $(OBJS)
         $(CC) $(CC_SWITCHES) -o $@ $^ $(LIBS)
 
@@ -260 +240 @@
         $(MAKE) -C $(R2_DIR)/src clean
         $(MAKE) -C $(IMG_DIR) clean
-        $(MAKE) -C $(TF_DIR) clean
         $(RM) nanovis client $(OBJS)