Changeset 2633 for trunk/packages/vizservers

Timestamp:

Oct 16, 2011 1:51:12 PM (13 years ago)

Author:

gah

Message:

 

Location:

trunk/packages/vizservers/pymolproxy

Files:

• Makefile.in (modified) (3 diffs)
• pymolproxy2.c (added)

trunk/packages/vizservers/pymolproxy/Makefile.in

@@ -1 +1 @@
 
-TARGETS         = pymolproxy
+TARGETS =       pymolproxy pymolproxy2
 
-CC              = @CC@
-CC_SWITCHES     = $(CFLAGS) $(EXTRA_CFLAGS) $(DEFINES) $(INCLUDES)
-CFLAGS          = @CFLAGS@ 
-DEFINES         = -DSTANDALONE
-EXTRA_CFLAGS    = -Wall 
-INCLUDES        = $(TCL_INC_SPEC)
-TCL_INC_SPEC    = @TCL_INC_SPEC@
-TCL_LIB_SPEC    = @TCL_LIB_SPEC@
-RP_LIB_DIR      = @RP_LIB_DIR@
+CC =            @CC@
+CC_SWITCHES =   $(CFLAGS) $(EXTRA_CFLAGS) $(DEFINES) $(INCLUDES)
+CFLAGS =        @CFLAGS@ 
+DEFINES =       -DSTANDALONE
+EXTRA_CFLAGS =  -Wall 
+INCLUDES =      $(TCL_INC_SPEC)
+TCL_INC_SPEC =  @TCL_INC_SPEC@
+TCL_LIB_SPEC =  @TCL_LIB_SPEC@
+RP_LIB_DIR =    @RP_LIB_DIR@
 
-bindir          = @bindir@
-datadir         = @datadir@
-datarootdir     = @datarootdir@
-exec_prefix     = @exec_prefix@
-includedir      = @includedir@
-libdir          = @libdir@
-mandir          = @mandir@
-prefix          = @prefix@
-srcdir          = @srcdir@
+bindir =        @bindir@
+datadir =       @datadir@
+datarootdir =   @datarootdir@
+exec_prefix =   @exec_prefix@
+includedir =    @includedir@
+libdir =        @libdir@
+mandir =        @mandir@
+prefix =        @prefix@
+srcdir =        @srcdir@
 
-RP_DIR          = @RP_DIR@
-INSTALL         = @INSTALL@
-MKDIR_P         = @MKDIR_P@
-VPATH           = $(srcdir)
+RP_DIR =        @RP_DIR@
+INSTALL =       @INSTALL@
+MKDIR_P =       @MKDIR_P@
+VPATH =         $(srcdir)
 
 .PHONY: all install clean distclean
 
-OBJS            = pymolproxy.o
-LIBS            = $(TCL_LIB_SPEC) \
-                  -Wl,-rpath,$(RP_LIB_DIR)
+PROXY_OBJS =    pymolproxy.o
+PROXY2_OBJS =   pymolproxy2.o
+LIBS =          $(TCL_LIB_SPEC) \
+                -Wl,-rpath,$(RP_LIB_DIR) 
 
 SCRIPTS         = $(srcdir)/scripts/box.py
@@ -37 +38 @@
 all: $(TARGETS)
 
-pymolproxy: $(OBJS) 
+pymolproxy: $(PROXY_OBJS) 
         $(CC) $(CC_SWITCHES) -o $@ $^ $(LIBS)
+
+pymolproxy2: $(PROXY2_OBJS) 
+        $(CC) $(CC_SWITCHES) -o $@ $^ $(LIBS) -lpthread
 
 .c.o:
@@ -45 +49 @@
 install: install-pymolproxy install-scripts
 
-install-pymolproxy: pymolproxy 
+install-pymolproxy: pymolproxy pymolproxy2
         $(MKDIR_P) -m 0755 $(bindir)
-        $(INSTALL) -m 0555 pymolproxy $(bindir)/pymolproxy
-        $(INSTALL) -m 0555 pymol $(bindir)/pymol
+        $(INSTALL) -m 0555 pymolproxy pymolproxy2 pymol $(bindir)
 
 install-scripts: