Changeset 4592 for pymolproxy/trunk


Ignore:
Timestamp:
Aug 1, 2014 7:30:44 PM (7 years ago)
Author:
ldelgass
Message:

Remove old (non-threaded) pymolproxy implementation from trunk. Can be restored
to a branch if ever need it again. The trunk version of nanoscale will be
changed to use pymolproxy as the binary name

Location:
pymolproxy/trunk
Files:
1 edited
1 moved

Legend:

Unmodified
Added
Removed
  • pymolproxy/trunk/Makefile.in

    r4589 r4592  
    11
    2 TARGETS =       pymolproxy pymolproxy2
     2TARGETS =       pymolproxy
    33
    44CC =            @CC@
     
    3434.PHONY: all install clean distclean
    3535
    36 FILES =         pymolproxy pymolproxy2
     36FILES =         pymolproxy
    3737PROXY_OBJS =    pymolproxy.o md5.o
    38 PROXY2_OBJS =   pymolproxy2.o md5.o
    3938LIBS =          $(TCL_LIB_SPEC) \
    4039                -Wl,-rpath,$(libdir)
     
    4544
    4645pymolproxy: $(PROXY_OBJS)
    47         $(CC) $(CC_SWITCHES) -o $@ $^ $(LIBS)
    48 
    49 pymolproxy2: $(PROXY2_OBJS)
    5046        $(CC) $(CC_SWITCHES) -o $@ $^ $(LIBS) -lpthread
    5147
     
    5551install: install-pymolproxy install-scripts
    5652
    57 install-pymolproxy: pymolproxy pymolproxy2
     53install-pymolproxy: pymolproxy
    5854        $(MKDIR_P) -m 0755 $(bindir)
    5955        for i in $(FILES) ; do \
  • pymolproxy/trunk/pymolproxy.c

    r4588 r4592  
    253253        s++;
    254254    }
    255     length = snprintf(message, MSG_LEN, "pymolproxy2 (%d) %s: %s:%d ",
     255    length = snprintf(message, MSG_LEN, "pymolproxy (%d) %s: %s:%d ",
    256256        getpid(), syslogLevels[priority],  s, lineNum);
    257257    length += vsnprintf(message + length, MSG_LEN - length, fmt, lst);
Note: See TracChangeset for help on using the changeset viewer.