[Benson-commit] CVS: benson3/src Makefile.in,1.44,1.45 network.c,1.29,NONE

[Bob T. <bt...@us...>]

Update of /cvsroot/benson/benson3/src
In directory sc8-pr-cvs1:/tmp/cvs-serv24239

Modified Files:
	Makefile.in 
Removed Files:
	network.c 
Log Message:
Reworked the network code to make a little more sense

Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson3/src/Makefile.in,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -r1.44 -r1.45
*** Makefile.in	30 Sep 2003 03:18:02 -0000	1.44
--- Makefile.in	30 Sep 2003 03:55:18 -0000	1.45
***************
*** 14,19 ****
  PERL_CFLAGS=@PERL_CFLAGS@
  PERL_LDFLAGS=@PERL_LDFLAGS@ @PERL_SLIBS@
  CPPFLAGS=@CPPFLAGS@ @DEFS@
! LIBS=@LIBS@ @PERL_LIBS@
  AR=@arpath@
  RANLIB=@RANLIB@
--- 14,20 ----
  PERL_CFLAGS=@PERL_CFLAGS@
  PERL_LDFLAGS=@PERL_LDFLAGS@ @PERL_SLIBS@
+ PERL_LIBS=@PERL_LIBS@
  CPPFLAGS=@CPPFLAGS@ @DEFS@
! LIBS=@LIBS@
  AR=@arpath@
  RANLIB=@RANLIB@
***************
*** 23,27 ****
  TARGETS=libbenson.so btrap ack alertlist bensond $(PERL_MODULES)
  
! LIBBENSON_OBJS=bsm.o cfgctl.o error.o network.o psaf_queue.o \
  		 stack.o utils.o vrml_builder.o
  
--- 24,28 ----
  TARGETS=libbenson.so btrap ack alertlist bensond $(PERL_MODULES)
  
! LIBBENSON_OBJS=bsm.o cfgctl.o error.o psaf_queue.o \
  		 stack.o utils.o vrml_builder.o
  
***************
*** 34,37 ****
--- 35,39 ----
  LIBRULES=rules/librules.a
  LIBNETWORK=network/libnetwork.a
+ LIBNETCLIENT=network/libnetclient.a
  LIBPERL=perl/libperl.a
  
***************
*** 43,59 ****
  bensond: $(BENSOND_OBJS)
  	$(CC) $(CFLAGS) $(CPPFLAGS) $(PERL_CFLAGS) -o bensond $(BENSOND_OBJS) libbenson.so $(LIBPERL) \
! 		$(LIBNETWORK) $(PERL_LDFLAGS) $(LIBS) -Wl,--rpath -Wl,. -Wl,--rpath -Wl,$(libdir)
  
  bn_rules.o:
  	$(CC) $(CFLAGS) $(CPPFLAGS) $(PERL_CFLAGS) -c bn_rules.c
  
! btrap: libbenson.a $(LIBPERL) $(LIBNETWORK)
! 	$(CC) $(CFLAGS) $(CPPFLAGS) $(PERL_CFLAGS) -o btrap btrap.c libbenson.a $(LIBPERL) $(LIBNETWORK) $(PERL_LDFLAGS) $(LIBS)
  
  ack: libbenson.a $(LIBPERL) $(LIBNETWORK)
! 	$(CC) $(CFLAGS) $(CPPFLAGS) $(PERL_CFLAGS) -o ack acknowledge.c libbenson.a $(LIBPERL) $(LIBNETWORK) $(PERL_LDFLAGS) $(LIBS)
  
  alertlist: libbenson.a $(LIBPERL) $(LIBNETWORK)
! 	$(CC) $(CFLAGS) $(CPPFLAGS) $(PERL_CFLAGS) -o alertlist alertlist.c libbenson.a $(LIBPERL) $(LIBNETWORK) $(PERL_LDFLAGS) $(LIBS)
  
  libbenson.a: $(LIBRULES) $(LIBPERL) $(LIBNETWORK) $(LIBBENSON_OBJS)
--- 45,61 ----
  bensond: $(BENSOND_OBJS)
  	$(CC) $(CFLAGS) $(CPPFLAGS) $(PERL_CFLAGS) -o bensond $(BENSOND_OBJS) libbenson.so $(LIBPERL) \
! 		$(LIBNETWORK) $(PERL_LDFLAGS) $(LIBS) $(PERL_LIBS) -Wl,--rpath -Wl,. -Wl,--rpath -Wl,$(libdir)
  
  bn_rules.o:
  	$(CC) $(CFLAGS) $(CPPFLAGS) $(PERL_CFLAGS) -c bn_rules.c
  
! btrap: libbenson.a $(LIBNETWORK)
! 	$(CC) $(CFLAGS) $(CPPFLAGS) -o btrap btrap.c libbenson.a $(LIBNETCLIENT) $(LIBS)
  
  ack: libbenson.a $(LIBPERL) $(LIBNETWORK)
! 	$(CC) $(CFLAGS) $(CPPFLAGS) -o ack acknowledge.c libbenson.a $(LIBNETCLIENT) $(LIBS)
  
  alertlist: libbenson.a $(LIBPERL) $(LIBNETWORK)
! 	$(CC) $(CFLAGS) $(CPPFLAGS) -o alertlist alertlist.c libbenson.a $(LIBNETCLIENT) $(LIBS)
  
  libbenson.a: $(LIBRULES) $(LIBPERL) $(LIBNETWORK) $(LIBBENSON_OBJS)

--- network.c DELETED ---