Changeset 4838 for branches/r9
- Timestamp:
- Dec 11, 2014, 11:10:02 AM (10 years ago)
- Location:
- branches/r9/packages/vizservers
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/r9/packages/vizservers/nanoscale/Makefile.in
r4111 r4838 33 33 SVN_VERSION = $(shell svnversion $(srcdir)) 34 34 35 DEFINES = -DSERVERSFILE=\"$(libdir)/renderservers.tcl\" \ 35 DEFINES = 36 SERVER_DEFINES = \ 37 -DSERVERSFILE=\"$(libdir)/renderservers.tcl\" \ 36 38 -DSVN_VERSION=\"$(SVN_VERSION)\" \ 37 39 -DLOGDIR=\"$(LOGDIR)\" … … 52 54 $(INSTALL_PROGRAM) -D nanoscale $(bindir)/nanoscale 53 55 $(INSTALL_SCRIPT) renderservers.tcl $(libdir) 56 $(INSTALL_PROGRAM) -m 0555 start_nanoscale.sh $(bindir)/start_nanoscale.sh 54 57 55 58 client: $(CLIENT_OBJS) … … 57 60 .c.o: 58 61 $(CC) $(CC_SWITCHES) -o $@ -c $< 62 63 server.o: server.c 64 $(CC) $(CC_SWITCHES) $(SERVER_DEFINES) -o $@ -c $< 59 65 60 66 clean: -
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. */ 2 2 3 3 /* Define if building universal (internal helper macro) */ … … 24 24 /* Define to 1 if you have the <netinet/in.h> header file. */ 25 25 #undef HAVE_NETINET_IN_H 26 27 /* Define to 1 if you have the <Python.h> header file. */28 #undef HAVE_PYTHON_H29 26 30 27 /* Define to 1 if you have the <stdint.h> header file. */ -
branches/r9/packages/vizservers/nanovis/Makefile.in
r4068 r4838 136 136 CFLAGS = @CFLAGS@ 137 137 EXTRA_CFLAGS = -Wall 138 DEFINES = -DSVN_VERSION=\"$(SVN_VERSION)\" -DSTATSDIR=\"$(STATSDIR)\" 138 SERVER_DEFINES = -DSVN_VERSION=\"$(SVN_VERSION)\" -DSTATSDIR=\"$(STATSDIR)\" 139 DEFINES = 139 140 ifdef TRACE 140 141 DEFINES += -DWANT_TRACE … … 333 334 $(MAKE) -C $(VRMATH_DIR) distclean 334 335 $(RM) Makefile nvconf.h *~ 336 337 nanovisServer.o: $(srcdir)/nanovisServer.cpp 338 $(CXX) $(CXX_SWITCHES) $(SERVER_DEFINES) -o $@ -c $< 335 339 336 340 Axis.o: Axis.cpp Axis.h Chain.h -
branches/r9/packages/vizservers/nanovis/configure
r4158 r4838 4721 4721 VTK_VERSION=$with_vtk 4722 4722 fi 4723 4723 echo vtk_includes="${VTK_INC_DIR}/vtk-${VTK_VERSION}" 4724 4724 if ! test -d "$VTK_INC_DIR/vtk-${VTK_VERSION}" ; then 4725 4725 as_fn_error $? "Couldn't find VTK includes" "$LINENO" 5 -
branches/r9/packages/vizservers/pymolproxy/Makefile.in
r4108 r4838 1 1 2 TARGETS = pymolproxy pymolproxy22 TARGETS = pymolproxy2 3 3 4 4 CC = @CC@ 5 5 CC_SWITCHES = $(CFLAGS) $(EXTRA_CFLAGS) $(DEFINES) $(INCLUDES) 6 6 CFLAGS = @CFLAGS@ 7 DEFINES = -DSTANDALONE \ 8 -DSVN_VERSION=\"$(SVN_VERSION)\" \ 9 -DSTATSDIR=\"$(STATSDIR)\" \ 10 -DLOGDIR=\"$(LOGDIR)\" 7 DEFINES = 11 8 EXTRA_CFLAGS = -Wall 12 9 INCLUDES = $(TCL_INC_SPEC) -I$(srcdir) 13 10 TCL_INC_SPEC = @TCL_INC_SPEC@ 14 11 TCL_LIB_SPEC = @TCL_LIB_SPEC@ 12 SERVER_DEFINES = \ 13 -DSVN_VERSION=\"$(SVN_VERSION)\" \ 14 -DSTATSDIR=\"$(STATSDIR)\" \ 15 -DLOGDIR=\"$(LOGDIR)\" 15 16 16 17 bindir = @bindir@ … … 53 54 $(CC) $(CC_SWITCHES) -o $@ -c $< 54 55 56 pymolproxy2.o: pymolproxy2.c 57 $(CC) $(CC_SWITCHES) $(SERVER_DEFINES) -o $@ -c $< 58 55 59 install: install-pymolproxy install-scripts 56 60 -
branches/r9/packages/vizservers/vtkvis/Makefile.in
r4242 r4838 105 105 EXTRA_CXXFLAGS = -Wall 106 106 EXTRA_CFLAGS = -Wall 107 DEFINES = -DSVN_VERSION=\"$(SVN_VERSION)\" -DSTATSDIR=\"$(STATSDIR)\" 107 DEFINES = 108 SERVER_DEFINES = \ 109 -DSVN_VERSION=\"$(SVN_VERSION)\" \ 110 -DSTATSDIR=\"$(STATSDIR)\" 108 111 ifdef DEBUG 109 112 DEFINES += -DDEBUG … … 225 228 distclean: clean clean-docs 226 229 $(RM) Makefile Doxyfile 230 231 RenderServer.o: RenderServer.cpp 232 $(CXX) $(CXX_SWITCHES) $(SERVER_DEFINES) -c $< -o $@ 227 233 228 234 Arc.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.