update
svn: r1932
This commit is contained in:
		@@ -1,7 +1,7 @@
 | 
			
		||||
# Makefile.in generated by automake 1.7.4 from Makefile.am.
 | 
			
		||||
# Makefile.in generated by automake 1.6.3 from Makefile.am.
 | 
			
		||||
# @configure_input@
 | 
			
		||||
 | 
			
		||||
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 | 
			
		||||
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
 | 
			
		||||
# Free Software Foundation, Inc.
 | 
			
		||||
# This Makefile.in is free software; the Free Software Foundation
 | 
			
		||||
# gives unlimited permission to copy and/or distribute it,
 | 
			
		||||
@@ -75,81 +75,78 @@
 | 
			
		||||
#		http://scrollkeeper.sourceforge.net/	
 | 
			
		||||
# 	Version: 0.1.2 (last updated: March 20, 2002)
 | 
			
		||||
#
 | 
			
		||||
SHELL = @SHELL@
 | 
			
		||||
 | 
			
		||||
srcdir = @srcdir@
 | 
			
		||||
top_srcdir = @top_srcdir@
 | 
			
		||||
VPATH = @srcdir@
 | 
			
		||||
prefix = @prefix@
 | 
			
		||||
exec_prefix = @exec_prefix@
 | 
			
		||||
 | 
			
		||||
bindir = @bindir@
 | 
			
		||||
sbindir = @sbindir@
 | 
			
		||||
libexecdir = @libexecdir@
 | 
			
		||||
datadir = @datadir@
 | 
			
		||||
sysconfdir = @sysconfdir@
 | 
			
		||||
sharedstatedir = @sharedstatedir@
 | 
			
		||||
localstatedir = @localstatedir@
 | 
			
		||||
libdir = @libdir@
 | 
			
		||||
infodir = @infodir@
 | 
			
		||||
mandir = @mandir@
 | 
			
		||||
includedir = @includedir@
 | 
			
		||||
oldincludedir = /usr/include
 | 
			
		||||
pkgdatadir = $(datadir)/@PACKAGE@
 | 
			
		||||
pkglibdir = $(libdir)/@PACKAGE@
 | 
			
		||||
pkgincludedir = $(includedir)/@PACKAGE@
 | 
			
		||||
top_builddir = ../../..
 | 
			
		||||
 | 
			
		||||
ACLOCAL = @ACLOCAL@
 | 
			
		||||
AUTOCONF = @AUTOCONF@
 | 
			
		||||
AUTOMAKE = @AUTOMAKE@
 | 
			
		||||
AUTOHEADER = @AUTOHEADER@
 | 
			
		||||
 | 
			
		||||
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 | 
			
		||||
INSTALL = @INSTALL@
 | 
			
		||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
 | 
			
		||||
INSTALL_DATA = @INSTALL_DATA@
 | 
			
		||||
install_sh_DATA = $(install_sh) -c -m 644
 | 
			
		||||
install_sh_PROGRAM = $(install_sh) -c
 | 
			
		||||
install_sh_SCRIPT = $(install_sh) -c
 | 
			
		||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
 | 
			
		||||
INSTALL_HEADER = $(INSTALL_DATA)
 | 
			
		||||
transform = $(program_transform_name)
 | 
			
		||||
transform = @program_transform_name@
 | 
			
		||||
NORMAL_INSTALL = :
 | 
			
		||||
PRE_INSTALL = :
 | 
			
		||||
POST_INSTALL = :
 | 
			
		||||
NORMAL_UNINSTALL = :
 | 
			
		||||
PRE_UNINSTALL = :
 | 
			
		||||
POST_UNINSTALL = :
 | 
			
		||||
ACLOCAL = @ACLOCAL@
 | 
			
		||||
AMDEP_FALSE = @AMDEP_FALSE@
 | 
			
		||||
AMDEP_TRUE = @AMDEP_TRUE@
 | 
			
		||||
 | 
			
		||||
EXEEXT = @EXEEXT@
 | 
			
		||||
OBJEXT = @OBJEXT@
 | 
			
		||||
PATH_SEPARATOR = @PATH_SEPARATOR@
 | 
			
		||||
AMTAR = @AMTAR@
 | 
			
		||||
AUTOCONF = @AUTOCONF@
 | 
			
		||||
AUTOHEADER = @AUTOHEADER@
 | 
			
		||||
AUTOMAKE = @AUTOMAKE@
 | 
			
		||||
AWK = @AWK@
 | 
			
		||||
BINSH = @BINSH@
 | 
			
		||||
CC = @CC@
 | 
			
		||||
CCDEPMODE = @CCDEPMODE@
 | 
			
		||||
CFLAGS = @CFLAGS@
 | 
			
		||||
CPP = @CPP@
 | 
			
		||||
CPPFLAGS = @CPPFLAGS@
 | 
			
		||||
CYGPATH_W = @CYGPATH_W@
 | 
			
		||||
DEFS = @DEFS@
 | 
			
		||||
DEPDIR = @DEPDIR@
 | 
			
		||||
ECHO_C = @ECHO_C@
 | 
			
		||||
ECHO_N = @ECHO_N@
 | 
			
		||||
ECHO_T = @ECHO_T@
 | 
			
		||||
EGREP = @EGREP@
 | 
			
		||||
EXEEXT = @EXEEXT@
 | 
			
		||||
GNOMEHELP = @GNOMEHELP@
 | 
			
		||||
GNOMEINC = @GNOMEINC@
 | 
			
		||||
GNOMELIB = @GNOMELIB@
 | 
			
		||||
GPREF = @GPREF@
 | 
			
		||||
GPREFIX = @GPREFIX@
 | 
			
		||||
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
 | 
			
		||||
INSTALL_DATA = @INSTALL_DATA@
 | 
			
		||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
 | 
			
		||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
 | 
			
		||||
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 | 
			
		||||
INTLLIBS = @INTLLIBS@
 | 
			
		||||
LANGUAGES = @LANGUAGES@
 | 
			
		||||
LDFLAGS = @LDFLAGS@
 | 
			
		||||
LIBOBJS = @LIBOBJS@
 | 
			
		||||
LIBS = @LIBS@
 | 
			
		||||
LTLIBOBJS = @LTLIBOBJS@
 | 
			
		||||
MAKEINFO = @MAKEINFO@
 | 
			
		||||
MOFILES = @MOFILES@
 | 
			
		||||
MSGFMT = @MSGFMT@
 | 
			
		||||
OBJEXT = @OBJEXT@
 | 
			
		||||
P15_INCLUDES = @P15_INCLUDES@
 | 
			
		||||
P20_INCLUDES = @P20_INCLUDES@
 | 
			
		||||
P21_INCLUDES = @P21_INCLUDES@
 | 
			
		||||
P22_INCLUDES = @P22_INCLUDES@
 | 
			
		||||
PACKAGE = @PACKAGE@
 | 
			
		||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 | 
			
		||||
PACKAGE_NAME = @PACKAGE_NAME@
 | 
			
		||||
PACKAGE_STRING = @PACKAGE_STRING@
 | 
			
		||||
PACKAGE_TARNAME = @PACKAGE_TARNAME@
 | 
			
		||||
PACKAGE_VERSION = @PACKAGE_VERSION@
 | 
			
		||||
PATH_SEPARATOR = @PATH_SEPARATOR@
 | 
			
		||||
POFILES = @POFILES@
 | 
			
		||||
PYTHON = @PYTHON@
 | 
			
		||||
PYTHON22 = @PYTHON22@
 | 
			
		||||
@@ -159,44 +156,19 @@ PYTHON_PREFIX = @PYTHON_PREFIX@
 | 
			
		||||
PYTHON_VERSION = @PYTHON_VERSION@
 | 
			
		||||
RELEASE = @RELEASE@
 | 
			
		||||
SCROLLKEEPER_BUILD_REQUIRED = @SCROLLKEEPER_BUILD_REQUIRED@
 | 
			
		||||
SET_MAKE = @SET_MAKE@
 | 
			
		||||
SHELL = @SHELL@
 | 
			
		||||
SK_CONFIG = @SK_CONFIG@
 | 
			
		||||
STRIP = @STRIP@
 | 
			
		||||
SWIG = @SWIG@
 | 
			
		||||
VERSION = @VERSION@
 | 
			
		||||
VERSIONSTRING = @VERSIONSTRING@
 | 
			
		||||
ZIP = @ZIP@
 | 
			
		||||
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@
 | 
			
		||||
am__leading_dot = @am__leading_dot@
 | 
			
		||||
am__quote = @am__quote@
 | 
			
		||||
bindir = @bindir@
 | 
			
		||||
build_alias = @build_alias@
 | 
			
		||||
datadir = @datadir@
 | 
			
		||||
exec_prefix = @exec_prefix@
 | 
			
		||||
host_alias = @host_alias@
 | 
			
		||||
includedir = @includedir@
 | 
			
		||||
infodir = @infodir@
 | 
			
		||||
install_sh = @install_sh@
 | 
			
		||||
libdir = @libdir@
 | 
			
		||||
libexecdir = @libexecdir@
 | 
			
		||||
localstatedir = @localstatedir@
 | 
			
		||||
mandir = @mandir@
 | 
			
		||||
oldincludedir = @oldincludedir@
 | 
			
		||||
pkgpyexecdir = @pkgpyexecdir@
 | 
			
		||||
pkgpythondir = @pkgpythondir@
 | 
			
		||||
prefix = @prefix@
 | 
			
		||||
program_transform_name = @program_transform_name@
 | 
			
		||||
pyexecdir = @pyexecdir@
 | 
			
		||||
pythondir = @pythondir@
 | 
			
		||||
sbindir = @sbindir@
 | 
			
		||||
sharedstatedir = @sharedstatedir@
 | 
			
		||||
sysconfdir = @sysconfdir@
 | 
			
		||||
target_alias = @target_alias@
 | 
			
		||||
figdir = figures
 | 
			
		||||
docname = gramps-manual
 | 
			
		||||
lang = C
 | 
			
		||||
@@ -219,12 +191,10 @@ CLEANFILES = omf_timestamp *.out
 | 
			
		||||
omf_dest_dir = $(datadir)/omf/@PACKAGE@
 | 
			
		||||
scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
 | 
			
		||||
subdir = doc/gramps-manual/C
 | 
			
		||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 | 
			
		||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 | 
			
		||||
CONFIG_CLEAN_FILES =
 | 
			
		||||
DIST_SOURCES =
 | 
			
		||||
DIST_COMMON = $(top_srcdir)/doc/omf.make $(top_srcdir)/doc/xmldocs.make \
 | 
			
		||||
	Makefile.am Makefile.in
 | 
			
		||||
DIST_COMMON = Makefile.am Makefile.in
 | 
			
		||||
all: all-am
 | 
			
		||||
 | 
			
		||||
.SUFFIXES:
 | 
			
		||||
@@ -237,23 +207,13 @@ uninstall-info-am:
 | 
			
		||||
tags: TAGS
 | 
			
		||||
TAGS:
 | 
			
		||||
 | 
			
		||||
ctags: CTAGS
 | 
			
		||||
CTAGS:
 | 
			
		||||
 | 
			
		||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 | 
			
		||||
 | 
			
		||||
top_distdir = ../../..
 | 
			
		||||
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 | 
			
		||||
 | 
			
		||||
distdir: $(DISTFILES)
 | 
			
		||||
	$(mkinstalldirs) $(distdir)/../../../doc
 | 
			
		||||
	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 | 
			
		||||
	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 | 
			
		||||
	list='$(DISTFILES)'; for file in $$list; do \
 | 
			
		||||
	  case $$file in \
 | 
			
		||||
	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
 | 
			
		||||
	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
 | 
			
		||||
	  esac; \
 | 
			
		||||
	@list='$(DISTFILES)'; for file in $$list; do \
 | 
			
		||||
	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 | 
			
		||||
	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 | 
			
		||||
	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 | 
			
		||||
@@ -274,7 +234,7 @@ distdir: $(DISTFILES)
 | 
			
		||||
	  fi; \
 | 
			
		||||
	done
 | 
			
		||||
	$(MAKE) $(AM_MAKEFLAGS) \
 | 
			
		||||
	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
 | 
			
		||||
	  top_distdir="${top_distdir}" distdir="$(distdir)" \
 | 
			
		||||
	  dist-hook
 | 
			
		||||
check-am: all-am
 | 
			
		||||
check: check-am
 | 
			
		||||
@@ -343,14 +303,6 @@ mostlyclean: mostlyclean-am
 | 
			
		||||
 | 
			
		||||
mostlyclean-am: mostlyclean-generic
 | 
			
		||||
 | 
			
		||||
pdf: pdf-am
 | 
			
		||||
 | 
			
		||||
pdf-am:
 | 
			
		||||
 | 
			
		||||
ps: ps-am
 | 
			
		||||
 | 
			
		||||
ps-am:
 | 
			
		||||
 | 
			
		||||
uninstall-am: uninstall-info-am uninstall-local
 | 
			
		||||
 | 
			
		||||
.PHONY: all all-am check check-am clean clean-generic distclean \
 | 
			
		||||
@@ -359,8 +311,8 @@ uninstall-am: uninstall-info-am uninstall-local
 | 
			
		||||
	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-generic pdf pdf-am ps ps-am uninstall \
 | 
			
		||||
	uninstall-am uninstall-info-am uninstall-local
 | 
			
		||||
	mostlyclean mostlyclean-generic uninstall uninstall-am \
 | 
			
		||||
	uninstall-info-am uninstall-local
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
omf: omf_timestamp
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user