Changeset 4838 for branches


Ignore:
Timestamp:
Dec 11, 2014 11:10:02 AM (6 years ago)
Author:
gah
Message:
 
Location:
branches/r9/packages/vizservers
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/r9/packages/vizservers/nanoscale/Makefile.in

    r4111 r4838  
    3333SVN_VERSION     = $(shell svnversion $(srcdir))
    3434
    35 DEFINES         = -DSERVERSFILE=\"$(libdir)/renderservers.tcl\" \
     35DEFINES         =
     36SERVER_DEFINES  = \
     37                -DSERVERSFILE=\"$(libdir)/renderservers.tcl\" \
    3638                -DSVN_VERSION=\"$(SVN_VERSION)\" \
    3739                -DLOGDIR=\"$(LOGDIR)\"
     
    5254        $(INSTALL_PROGRAM) -D nanoscale $(bindir)/nanoscale
    5355        $(INSTALL_SCRIPT) renderservers.tcl $(libdir)
     56        $(INSTALL_PROGRAM) -m 0555 start_nanoscale.sh $(bindir)/start_nanoscale.sh
    5457
    5558client: $(CLIENT_OBJS)
     
    5760.c.o:
    5861        $(CC) $(CC_SWITCHES) -o $@ -c $<
     62
     63server.o: server.c
     64        $(CC) $(CC_SWITCHES) $(SERVER_DEFINES) -o $@ -c $<
    5965
    6066clean:
  • branches/r9/packages/vizservers/nanoscale/config.h.in

    r4108 r4838  
    1 /* nanoscale/config.h.in.  Generated from configure.in by autoheader.  */
     1/* config.h.in.  Generated from configure.in by autoheader.  */
    22
    33/* Define if building universal (internal helper macro) */
     
    2424/* Define to 1 if you have the <netinet/in.h> header file. */
    2525#undef HAVE_NETINET_IN_H
    26 
    27 /* Define to 1 if you have the <Python.h> header file. */
    28 #undef HAVE_PYTHON_H
    2926
    3027/* Define to 1 if you have the <stdint.h> header file. */
  • branches/r9/packages/vizservers/nanovis/Makefile.in

    r4068 r4838  
    136136CFLAGS          = @CFLAGS@
    137137EXTRA_CFLAGS    = -Wall
    138 DEFINES         = -DSVN_VERSION=\"$(SVN_VERSION)\" -DSTATSDIR=\"$(STATSDIR)\"
     138SERVER_DEFINES  = -DSVN_VERSION=\"$(SVN_VERSION)\" -DSTATSDIR=\"$(STATSDIR)\"
     139DEFINES         =
    139140ifdef TRACE
    140141DEFINES         += -DWANT_TRACE
     
    333334        $(MAKE) -C $(VRMATH_DIR) distclean
    334335        $(RM) Makefile nvconf.h *~
     336
     337nanovisServer.o: $(srcdir)/nanovisServer.cpp
     338        $(CXX) $(CXX_SWITCHES) $(SERVER_DEFINES) -o $@ -c $<
    335339
    336340Axis.o: Axis.cpp Axis.h Chain.h
  • branches/r9/packages/vizservers/nanovis/configure

    r4158 r4838  
    47214721   VTK_VERSION=$with_vtk
    47224722fi
    4723 
     4723echo vtk_includes="${VTK_INC_DIR}/vtk-${VTK_VERSION}"
    47244724if ! test -d "$VTK_INC_DIR/vtk-${VTK_VERSION}" ; then
    47254725   as_fn_error $? "Couldn't find VTK includes" "$LINENO" 5
  • branches/r9/packages/vizservers/pymolproxy/Makefile.in

    r4108 r4838  
    11
    2 TARGETS =       pymolproxy pymolproxy2
     2TARGETS =       pymolproxy2
    33
    44CC =            @CC@
    55CC_SWITCHES =   $(CFLAGS) $(EXTRA_CFLAGS) $(DEFINES) $(INCLUDES)
    66CFLAGS =        @CFLAGS@
    7 DEFINES =       -DSTANDALONE \
    8                 -DSVN_VERSION=\"$(SVN_VERSION)\" \
    9                 -DSTATSDIR=\"$(STATSDIR)\" \
    10                 -DLOGDIR=\"$(LOGDIR)\"
     7DEFINES =       
    118EXTRA_CFLAGS =  -Wall
    129INCLUDES =      $(TCL_INC_SPEC) -I$(srcdir)
    1310TCL_INC_SPEC =  @TCL_INC_SPEC@
    1411TCL_LIB_SPEC =  @TCL_LIB_SPEC@
     12SERVER_DEFINES = \
     13                -DSVN_VERSION=\"$(SVN_VERSION)\" \
     14                -DSTATSDIR=\"$(STATSDIR)\" \
     15                -DLOGDIR=\"$(LOGDIR)\"
    1516
    1617bindir =        @bindir@
     
    5354        $(CC) $(CC_SWITCHES) -o $@ -c $<
    5455
     56pymolproxy2.o: pymolproxy2.c
     57        $(CC) $(CC_SWITCHES) $(SERVER_DEFINES) -o $@ -c $<
     58
    5559install: install-pymolproxy install-scripts
    5660
  • branches/r9/packages/vizservers/vtkvis/Makefile.in

    r4242 r4838  
    105105EXTRA_CXXFLAGS  = -Wall
    106106EXTRA_CFLAGS    = -Wall
    107 DEFINES         = -DSVN_VERSION=\"$(SVN_VERSION)\" -DSTATSDIR=\"$(STATSDIR)\"
     107DEFINES         =
     108SERVER_DEFINES  = \
     109                -DSVN_VERSION=\"$(SVN_VERSION)\" \
     110                -DSTATSDIR=\"$(STATSDIR)\"
    108111ifdef DEBUG
    109112DEFINES         += -DDEBUG
     
    225228distclean: clean clean-docs
    226229        $(RM) Makefile Doxyfile
     230
     231RenderServer.o: RenderServer.cpp
     232        $(CXX) $(CXX_SWITCHES) $(SERVER_DEFINES) -c $< -o $@
    227233
    228234Arc.o: Arc.h Shape.h GraphicsObject.h Math.h DataSet.h Renderer.h Trace.h
Note: See TracChangeset for help on using the changeset viewer.