1c75ec9f88
Changes since 15.7a - Allow usage of function keys ctrl-f and ctrl-b even from result pane. - More informative display of position in a multi-screenful result set. - Handle source files with freaky large numbers of lines. - Search for assignment failed to recognize >>= and <<=, incorrectly recognized ~=, and was implemented somewhat clumsily. - Added vi plugin to read cscope db's - Tolerate C++ :: scope operator inside argument lists, too. - Bug fixes.
208 lines
7 KiB
Text
208 lines
7 KiB
Text
$NetBSD: patch-ad,v 1.7 2012/10/25 08:28:20 asau Exp $
|
|
|
|
--- contrib/Makefile.in.orig 2012-08-04 15:17:12.000000000 +0000
|
|
+++ contrib/Makefile.in
|
|
@@ -1,9 +1,8 @@
|
|
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.12.4 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
|
|
-# Foundation, Inc.
|
|
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
|
|
+
|
|
# This Makefile.in is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
@@ -16,6 +15,23 @@
|
|
@SET_MAKE@
|
|
|
|
VPATH = @srcdir@
|
|
+am__make_dryrun = \
|
|
+ { \
|
|
+ am__dry=no; \
|
|
+ case $$MAKEFLAGS in \
|
|
+ *\\[\ \ ]*) \
|
|
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
|
|
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
|
|
+ *) \
|
|
+ for am__flg in $$MAKEFLAGS; do \
|
|
+ case $$am__flg in \
|
|
+ *=*|--*) ;; \
|
|
+ *n*) am__dry=yes; break;; \
|
|
+ esac; \
|
|
+ done;; \
|
|
+ esac; \
|
|
+ test $$am__dry = yes; \
|
|
+ }
|
|
pkgdatadir = $(datadir)/@PACKAGE@
|
|
pkgincludedir = $(includedir)/@PACKAGE@
|
|
pkglibdir = $(libdir)/@PACKAGE@
|
|
@@ -35,7 +51,8 @@ POST_UNINSTALL = :
|
|
build_triplet = @build@
|
|
host_triplet = @host@
|
|
subdir = contrib
|
|
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
|
|
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
|
|
+ $(top_srcdir)/mkinstalldirs
|
|
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
|
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
|
|
$(top_srcdir)/configure.in
|
|
@@ -45,6 +62,13 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/m
|
|
CONFIG_HEADER = $(top_builddir)/config.h
|
|
CONFIG_CLEAN_FILES =
|
|
CONFIG_CLEAN_VPATH_FILES =
|
|
+SOURCES =
|
|
+DIST_SOURCES =
|
|
+am__can_run_installinfo = \
|
|
+ case $$AM_UPDATE_INFO_DIR in \
|
|
+ n|no|NO) false;; \
|
|
+ *) (install-info --version) >/dev/null 2>&1;; \
|
|
+ esac
|
|
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
|
|
am__vpath_adj = case $$p in \
|
|
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
|
|
@@ -72,10 +96,8 @@ am__uninstall_files_from_dir = { \
|
|
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
|
|
$(am__cd) "$$dir" && rm -f $$files; }; \
|
|
}
|
|
-am__installdirs = "$(DESTDIR)$(bindir)"
|
|
-SCRIPTS = $(bin_SCRIPTS)
|
|
-SOURCES =
|
|
-DIST_SOURCES =
|
|
+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
|
|
+DATA = $(pkgdata_DATA)
|
|
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
|
ACLOCAL = @ACLOCAL@
|
|
AMTAR = @AMTAR@
|
|
@@ -180,7 +202,7 @@ target_alias = @target_alias@
|
|
top_build_prefix = @top_build_prefix@
|
|
top_builddir = @top_builddir@
|
|
top_srcdir = @top_srcdir@
|
|
-bin_SCRIPTS = ocs
|
|
+pkgdata_DATA = ocs
|
|
EXTRA_DIST = README ocs cctree.txt cctree.vim xcscope webcscope
|
|
all: all-am
|
|
|
|
@@ -215,44 +237,35 @@ $(top_srcdir)/configure: $(am__configur
|
|
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
$(am__aclocal_m4_deps):
|
|
-install-binSCRIPTS: $(bin_SCRIPTS)
|
|
+install-pkgdataDATA: $(pkgdata_DATA)
|
|
@$(NORMAL_INSTALL)
|
|
- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
|
|
- @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
|
|
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
|
|
+ if test -n "$$list"; then \
|
|
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
|
|
+ $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
|
|
+ fi; \
|
|
for p in $$list; do \
|
|
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
|
- if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
|
|
- done | \
|
|
- sed -e 'p;s,.*/,,;n' \
|
|
- -e 'h;s|.*|.|' \
|
|
- -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
|
|
- $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
|
|
- { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
|
|
- if ($$2 == $$4) { files[d] = files[d] " " $$1; \
|
|
- if (++n[d] == $(am__install_max)) { \
|
|
- print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
|
|
- else { print "f", d "/" $$4, $$1 } } \
|
|
- END { for (d in files) print "f", d, files[d] }' | \
|
|
- while read type dir files; do \
|
|
- if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
|
|
- test -z "$$files" || { \
|
|
- echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
|
|
- $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
|
|
- } \
|
|
- ; done
|
|
+ echo "$$d$$p"; \
|
|
+ done | $(am__base_list) | \
|
|
+ while read files; do \
|
|
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
|
|
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
|
|
+ done
|
|
|
|
-uninstall-binSCRIPTS:
|
|
+uninstall-pkgdataDATA:
|
|
@$(NORMAL_UNINSTALL)
|
|
- @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
|
|
- files=`for p in $$list; do echo "$$p"; done | \
|
|
- sed -e 's,.*/,,;$(transform)'`; \
|
|
- dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
|
|
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
|
|
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
|
|
+ dir='$(DESTDIR)$(pkgdatadir)'; $(am__uninstall_files_from_dir)
|
|
tags: TAGS
|
|
TAGS:
|
|
|
|
ctags: CTAGS
|
|
CTAGS:
|
|
|
|
+cscope cscopelist:
|
|
+
|
|
|
|
distdir: $(DISTFILES)
|
|
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
|
|
@@ -286,9 +299,9 @@ distdir: $(DISTFILES)
|
|
done
|
|
check-am: all-am
|
|
check: check-am
|
|
-all-am: Makefile $(SCRIPTS)
|
|
+all-am: Makefile $(DATA)
|
|
installdirs:
|
|
- for dir in "$(DESTDIR)$(bindir)"; do \
|
|
+ for dir in "$(DESTDIR)$(pkgdatadir)"; do \
|
|
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
|
|
done
|
|
install: install-am
|
|
@@ -341,13 +354,13 @@ info: info-am
|
|
|
|
info-am:
|
|
|
|
-install-data-am:
|
|
+install-data-am: install-pkgdataDATA
|
|
|
|
install-dvi: install-dvi-am
|
|
|
|
install-dvi-am:
|
|
|
|
-install-exec-am: install-binSCRIPTS
|
|
+install-exec-am:
|
|
|
|
install-html: install-html-am
|
|
|
|
@@ -385,20 +398,20 @@ ps: ps-am
|
|
|
|
ps-am:
|
|
|
|
-uninstall-am: uninstall-binSCRIPTS
|
|
+uninstall-am: uninstall-pkgdataDATA
|
|
|
|
.MAKE: install-am install-strip
|
|
|
|
.PHONY: all all-am check check-am clean clean-generic distclean \
|
|
distclean-generic distdir dvi dvi-am html html-am info info-am \
|
|
- install install-am install-binSCRIPTS install-data \
|
|
- install-data-am install-dvi install-dvi-am install-exec \
|
|
- install-exec-am install-html install-html-am install-info \
|
|
- install-info-am install-man install-pdf install-pdf-am \
|
|
- install-ps install-ps-am install-strip installcheck \
|
|
- installcheck-am installdirs maintainer-clean \
|
|
- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
|
|
- pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS
|
|
+ install install-am install-data install-data-am install-dvi \
|
|
+ install-dvi-am install-exec install-exec-am install-html \
|
|
+ install-html-am install-info install-info-am install-man \
|
|
+ install-pdf install-pdf-am install-pkgdataDATA install-ps \
|
|
+ install-ps-am install-strip installcheck installcheck-am \
|
|
+ installdirs maintainer-clean maintainer-clean-generic \
|
|
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
|
|
+ uninstall-am uninstall-pkgdataDATA
|
|
|
|
|
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|