CVS: linux-atm/src/lib Makefile.am,1.1.2.3,1.1.2.4 timer.c,1.1.2.1,1.1.2.2

[Paul B. S. <pa...@us...>]

Update of /cvsroot/linux-atm/linux-atm/src/lib
In directory usw-pr-cvs1:/tmp/cvs-serv2637/src/lib

Modified Files:
      Tag: V2_4_0
	Makefile.am timer.c 
Log Message:
These changes combie libatmd and libatm into one library: libatm..  (Suggested
by Russell Coker)
Also fixed shared object build which had an undefined reference to 'now'..
Simply needed to define 'now' in src/lib/timer.c..  It is defined as extern
in src/include/atmd.h...

Lastly..  Added 'cscope' target to toplevel Makefile.am to create tags...


Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/lib/Attic/Makefile.am,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** Makefile.am	2001/10/03 19:12:59	1.1.2.3
--- Makefile.am	2001/10/04 21:17:26	1.1.2.4
***************
*** 1,17 ****
! lib_LTLIBRARIES = libatm.la libatmd.la
  
  LDFLAGS = -version-info @ATMLIBS_VERSION@
  
  libatm_la_SOURCES = text2atm.c atm2text.c atmequal.c sdu2cell.c text2qos.c \
  			qos2text.c qosequal.c sap2text.c text2sap.c sapequal.c \
! 			misc.c atmres.h ans.c
  libatm_la_LIBADD = -lresolv
  libatm_la_DEPENDENCIES = $(top_builddir)/src/include/atm.h \
  				$(top_builddir)/src/include/atmsap.h \
! 				$(top_builddir)/src/include/stdint.h
  
! libatmd_la_SOURCES = common.c diag.c kptr.c text2ip.c timer.c unix.c
! libatmd_la_DEPENDENCIES = $(top_builddir)/src/include/atm.h \
! 				$(top_builddir)/src/include/atmd.h \
! 				$(top_builddir)/src/include/stdint.h
  
--- 1,32 ----
! #lib_LTLIBRARIES = libatm.la libatmd.la
! lib_LTLIBRARIES = libatm.la
  
+ # ATMLIBS_VERSION comes from configure.in in the toplevel directory
  LDFLAGS = -version-info @ATMLIBS_VERSION@
  
+ 
+ 
  libatm_la_SOURCES = text2atm.c atm2text.c atmequal.c sdu2cell.c text2qos.c \
  			qos2text.c qosequal.c sap2text.c text2sap.c sapequal.c \
! 			misc.c atmres.h ans.c \
! 			common.c diag.c kptr.c text2ip.c timer.c unix.c
  libatm_la_LIBADD = -lresolv
  libatm_la_DEPENDENCIES = $(top_builddir)/src/include/atm.h \
  				$(top_builddir)/src/include/atmsap.h \
! 				$(top_builddir)/src/include/stdint.h \
! 				$(top_builddir)/src/include/atmd.h
  
! 
! #libatm_la_SOURCES = text2atm.c atm2text.c atmequal.c sdu2cell.c text2qos.c \
! #			qos2text.c qosequal.c sap2text.c text2sap.c sapequal.c \
! #			misc.c atmres.h ans.c
! #libatm_la_LIBADD = -lresolv
! #libatm_la_DEPENDENCIES = $(top_builddir)/src/include/atm.h \
! #				$(top_builddir)/src/include/atmsap.h \
! #				$(top_builddir)/src/include/stdint.h
! #
! #libatmd_la_SOURCES = common.c diag.c kptr.c text2ip.c timer.c unix.c
! #libatmd_la_DEPENDENCIES = $(top_builddir)/src/include/atm.h \
! #				$(top_builddir)/src/include/atmd.h \
! #				$(top_builddir)/src/include/stdint.h
  

Index: timer.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/lib/Attic/timer.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** timer.c	2001/09/03 18:41:05	1.1.2.1
--- timer.c	2001/10/04 21:17:26	1.1.2.2
***************
*** 16,20 ****
  
  static TIMER *timers = NULL;
! 
  
  static void dump_list(const char *label)
--- 16,20 ----
  
  static TIMER *timers = NULL;
! struct timeval now;
  
  static void dump_list(const char *label)