Changeset 766

Timestamp:

01/06/10 15:36:31 (2 months ago)

Author:

PavelVinogradov

Message:

Remove deprecated samsf

Location:

branches/1.1.x

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (7 diffs)
• daemon.c (deleted)

branches/1.1.x/Makefile.am

@@ -19 +19 @@
 
 # what to make and install
-bin_PROGRAMS = sams samsf samsredir samsdaemon 
+bin_PROGRAMS = sams samsredir samsdaemon 
 
 # sources for both squidlog
@@ -25 +25 @@
         demon.c \
         redirect.c \
-        daemon.c \
         samsdaemon.c \
         define.h \

branches/1.1.x/Makefile.in

@@ -93 +93 @@
 
 # what to make and install
-bin_PROGRAMS = sams samsf samsredir samsdaemon 
+bin_PROGRAMS = sams samsredir samsdaemon 
 
 # sources for both sams
 base_sources =          demon.c         define.h        tools.c         tools.h
-socket_sources =        daemon.c        define.h        tools.c         tools.h
 samsredir_sources =     redirect.c      define.h        tools.c         tools.h
 samsdaemon_sources =    samsdaemon.c    define.h        tools.c         tools.h
 
 sams_SOURCES = $(base_sources) 
-sock_SOURCES = $(socket_sources) 
 samsredir_SOURCES = $(samsredir_sources)
 samsdaemon_SOURCES = $(samsdaemon_sources)
@@ -125 +123 @@
 LDFLAGS = @LDFLAGS@
 sams_OBJECTS =  demon.o tools.o
-sock_OBJECTS =  daemon.o tools.o
 samsredir_OBJECTS = redirect.o tools.o
 samsdaemon_OBJECTS = samsdaemon.o tools.o
 sams_LDADD = $(LDADD)
-sock_LDADD = $(LDADD)
 samsredir_LDADD = $(LDADD)
 samsdaemon_LDADD = $(LDADD)
 sams_DEPENDENCIES = 
-sock_DEPENDENCIES = 
 samsredir_DEPENDENCIES =
 samsdaemon_DEPENDENCIES =
 sams_LDFLAGS = 
-sock_LDFLAGS = 
 samsredir_LDFLAGS =
 samsdaemon_LDFLAGS =
@@ -155 +149 @@
 GZIP_ENV = --best
 DEP_FILES =  .deps/demon.P .deps/tools.P
-SOURCES = $(sams_SOURCES) $(sock_SOURCES) $(samsredir_SOURCES) $(samsdaemon_SOURCES) 
-OBJECTS = $(sams_OBJECTS) $(sock_OBJECTS) $(samsredir_OBJECTS) $(samsdaemon_OBJECTS)
+SOURCES = $(sams_SOURCES) $(samsredir_SOURCES) $(samsdaemon_SOURCES) 
+OBJECTS = $(sams_OBJECTS) $(samsredir_OBJECTS) $(samsdaemon_OBJECTS)
 
 all: all-redirect
@@ -204 +198 @@
         cp ./etc/sams.conf $(sysconfdir);
         cp ./sams $(bindir);
-        cp ./samsf $(bindir);
         cp ./samsredir $(bindir);
         cp ./samsdaemon $(bindir);
@@ -251 +244 @@
 uninstall-binPROGRAMS:
         rm $(bindir)/sams;
-        rm $(bindir)/samsf;
         rm $(bindir)/samsredir;
         rm $(bindir)/samsdaemon;
@@ -262 +254 @@
 update-binPROGRAMS:
         cp ./sams $(bindir);
-        cp ./samsf $(bindir);
         cp ./samsredir $(bindir);
         cp ./samsdaemon $(bindir);
@@ -313 +304 @@
         @rm -f sams
         $(LINK) $(sams_LDFLAGS) $(sams_OBJECTS) $(sams_LDADD) $(LIBS)
-
-samsf: $(sock_OBJECTS) $(sock_DEPENDENCIES)
-        @rm -f samsf
-        $(LINK) $(sock_LDFLAGS) $(sock_OBJECTS) $(sock_LDADD) $(LIBS)
 
 samsdaemon: $(samsdaemon_OBJECTS) $(samsdaemon_DEPENDENCIES)