From 911aae05b5d3ffd2543333e27cf06778381c7b3c Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Sat, 23 May 2009 15:14:45 +0200 Subject: New upstream release 15.7a, fixing CVE-2009-0148 --- src/Makefile.in | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) (limited to 'src/Makefile.in') diff --git a/src/Makefile.in b/src/Makefile.in index 0842105..913d134 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -36,13 +36,15 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +LIBOBJDIR = @HAS_GNOME_TRUE@EXTRA_PROGRAMS = gscope$(EXEEXT) bin_PROGRAMS = cscope$(EXEEXT) subdir = src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in egrep.c \ - fscanner.c scanner.c + fscanner.c scanner.c snprintf.c ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -71,7 +73,9 @@ am_cscope_OBJECTS = $(am__objects_1) egrep.$(OBJEXT) alloc.$(OBJEXT) \ vpinit.$(OBJEXT) vpopen.$(OBJEXT) cscope_OBJECTS = $(am_cscope_OBJECTS) am__DEPENDENCIES_1 = -cscope_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +am__DEPENDENCIES_2 = @LIBOBJS@ +cscope_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_2) am__gscope_SOURCES_DIST = gscope.c fscanner.l scanner.l egrep.y \ alloc.c alloc.h basename.c build.c build.h command.c compath.c \ constants.h crossref.c dir.c display.c edit.c exec.c find.c \ @@ -141,6 +145,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GNOME_LINUX_FALSE = @GNOME_LINUX_FALSE@ GNOME_LINUX_TRUE = @GNOME_LINUX_TRUE@ +GREP = @GREP@ HAS_CURSES_FALSE = @HAS_CURSES_FALSE@ HAS_CURSES_TRUE = @HAS_CURSES_TRUE@ HAS_GNOME_FALSE = @HAS_GNOME_FALSE@ @@ -174,8 +179,8 @@ USING_LEX_FALSE = @USING_LEX_FALSE@ USING_LEX_TRUE = @USING_LEX_TRUE@ VERSION = @VERSION@ YACC = @YACC@ +YFLAGS = @YFLAGS@ ac_ct_CC = @ac_ct_CC@ -ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ @@ -190,6 +195,9 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnome1 = @gnome1@ gnome2 = @gnome2@ @@ -198,17 +206,21 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ @@ -226,7 +238,7 @@ logdir.c lookup.c lookup.h main.c mouse.c mygetenv.c mypopen.c scanner.h \ version.h vp.h vpaccess.c vpfopen.c vpinit.c vpopen.c EXTRA_cscope_SOURCES = scanner.l fscanner.l -cscope_LDADD = $(CURSES_LIBS) $(LEXLIB) +cscope_LDADD = $(CURSES_LIBS) $(LEXLIB) $(LIBOBJS) AM_CPPFLAGS = $(CURSES_INCLUDEDIR) CLEANFILES = scanner.c fscanner.c egrep.c #dist-hook: @@ -307,6 +319,7 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/snprintf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alloc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basename.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/build.Po@am__quote@ @@ -907,7 +920,7 @@ clean: clean-am clean-am: clean-binPROGRAMS clean-generic mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -rf $(DEPDIR) ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -933,7 +946,7 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -rf $(DEPDIR) ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic -- cgit v1.2.3-54-g00ecf