[Cscope-cvs] CVS: cscope/src Makefile.am,1.8,1.9 Makefile.in,1.7,1.8 ylwrap,1.1,NONE

[Hans-Bernhard B. <br...@us...>]

Update of /cvsroot/cscope/cscope/src
In directory sc8-pr-cvs1:/tmp/cvs-serv26195/src

Modified Files:
	Makefile.am Makefile.in 
Removed Files:
	ylwrap 
Log Message:
Update autoconf/automake setup to latest versions.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/cscope/cscope/src/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** Makefile.am	9 Jul 2001 14:00:25 -0000	1.8
--- Makefile.am	23 Jan 2003 17:30:44 -0000	1.9
***************
*** 1,4 ****
--- 1,15 ----
  ## Process this file with automake to produce Makefile.in
  
+ if HAS_GNOME
+ if USING_GNOME2
+ GNOMECFLAGS = `pkg-config --cflags libgnomeui-2.0 libpanelapplet-2.0 libglade-2.0`
+ GNOMELINKAGE = `pkg-config --libs libgnomeui-2.0 libpanelapplet-2.0 libglade-2.0|sed -e 's/-lz //'`
+ else
+ GNOMECFLAGS = `gnome-config --cflags gnomeui applets libglade`
+ GNOMELINKAGE = `gnome-config --libs gnomeui applets libglade|sed -e 's/-lz //'`	
+ endif
+ 
+ EXTRA_PROGRAMS = gscope
+ endif
  bin_PROGRAMS = cscope
  
***************
*** 30,31 ****
--- 41,56 ----
  
  EXTRA_DIST = emacs.e gmacs.ml
+ 
+ if HAS_GNOME
+ GNOME_SWITCH=-DUSING_GNOME_UI
+ 
+ ## if we compile gscope under Linux, we need to supply libglade the callback pointers
+ if GNOME_LINUX
+ GNOME_LINUX_FLAG = "-rdynamic"
+ endif
+ 
+ gscope_CFLAGS = $(GNOMECFLAGS) $(GNOME_SWITCH)
+ gscope_LDADD =  $(CURSES_LIBS) $(LEXLIB)
+ gscope_SOURCES = gscope.c $(cscope_SOURCES)
+ gscope_LDFLAGS = $(GNOMELINKAGE) $(GNOME_LINUX_FLAG)
+ endif

Index: Makefile.in
===================================================================
RCS file: /cvsroot/cscope/cscope/src/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** Makefile.in	28 Jul 2002 15:40:06 -0000	1.7
--- Makefile.in	23 Jan 2003 17:30:45 -0000	1.8
***************
*** 1,5 ****
! # Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
  
! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
--- 1,7 ----
! # Makefile.in generated by automake 1.7.2 from Makefile.am.
! # @configure_input@
  
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
[...1561 lines suppressed...]
! 
! ps-am:
! 
! uninstall-am: uninstall-binPROGRAMS uninstall-info-am
! 
! .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
! 	clean-generic ctags distclean distclean-compile \
! 	distclean-depend distclean-generic distclean-tags distdir dvi \
! 	dvi-am info info-am install install-am install-binPROGRAMS \
! 	install-data install-data-am install-exec install-exec-am \
! 	install-info install-info-am install-man install-strip \
! 	installcheck installcheck-am installdirs maintainer-clean \
! 	maintainer-clean-generic mostlyclean mostlyclean-compile \
! 	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
! 	uninstall-am uninstall-binPROGRAMS uninstall-info-am
  
  dist-hook:
  	rm -f $(distdir)/scanner.c $(distdir)/fscanner.c $(distdir)/egrep.c
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.

--- ylwrap DELETED ---