From 2d81ccd5427ef70cbe343ecdf759205c752fd701 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Sat, 21 Feb 2004 06:11:59 +0000 Subject: [PATCH] First DB pass svn: r2884 --- gramps2/Makefile.in | 218 +++----- gramps2/aclocal.m4 | 196 ++----- gramps2/configure | 594 ++++++++------------- gramps2/doc/Makefile.in | 176 ++---- gramps2/doc/gramps-manual/C/Makefile.in | 126 ++--- gramps2/doc/gramps-manual/Makefile.in | 171 ++---- gramps2/doc/gramps-manual/fr/Makefile.in | 126 ++--- gramps2/doc/gramps-manual/ru/Makefile.in | 126 ++--- gramps2/doc/gramps.1 | 2 +- gramps2/example/Makefile.in | 171 ++---- gramps2/example/gramps/Makefile.in | 122 ++--- gramps2/gramps-mdk.spec | 4 +- gramps2/gramps.spec | 4 +- gramps2/src/AddMedia.py | 3 +- gramps2/src/BaseDoc.py | 4 +- gramps2/src/ChooseParents.py | 6 + gramps2/src/EditPerson.py | 52 +- gramps2/src/EditPlace.py | 2 +- gramps2/src/EditSource.py | 4 +- gramps2/src/EventEdit.py | 1 + gramps2/src/FamilyView.py | 12 +- gramps2/src/GrampsParser.py | 62 ++- gramps2/src/GrampsXML.py | 18 +- gramps2/src/ImageSelect.py | 78 +-- gramps2/src/Makefile.in | 198 +++---- gramps2/src/Marriage.py | 3 +- gramps2/src/MediaView.py | 22 +- gramps2/src/MergeData.py | 8 +- gramps2/src/PedView.py | 35 +- gramps2/src/PeopleView.py | 21 +- gramps2/src/ReadXML.py | 26 +- gramps2/src/RelLib.py | 582 +++++++++++--------- gramps2/src/Witness.py | 4 +- gramps2/src/WriteXML.py | 12 +- gramps2/src/calendars/Makefile.in | 129 ++--- gramps2/src/data/Makefile.in | 170 ++---- gramps2/src/data/templates/Makefile.in | 122 ++--- gramps2/src/docgen/AbiWord2Doc.py | 8 +- gramps2/src/docgen/HtmlDoc.py | 2 +- gramps2/src/docgen/KwordDoc.py | 14 +- gramps2/src/docgen/LaTeXDoc.py | 2 +- gramps2/src/docgen/Makefile.in | 129 ++--- gramps2/src/docgen/OpenOfficeDoc.py | 12 +- gramps2/src/docgen/PdfDoc.py | 2 +- gramps2/src/docgen/RTFDoc.py | 2 +- gramps2/src/filters/HavePhotos.py | 2 +- gramps2/src/filters/Makefile.in | 129 ++--- gramps2/src/gramps_main.py | 29 +- gramps2/src/plugins/Ancestors.py | 8 +- gramps2/src/plugins/Check.py | 16 +- gramps2/src/plugins/DetAncestralReport.py | 4 +- gramps2/src/plugins/DetDescendantReport.py | 4 +- gramps2/src/plugins/IndivComplete.py | 8 +- gramps2/src/plugins/IndivSummary.py | 8 +- gramps2/src/plugins/Makefile.in | 134 ++--- gramps2/src/plugins/ReadGedcom.py | 124 +++-- gramps2/src/plugins/SimpleBookTitle.py | 2 +- gramps2/src/plugins/Summary.py | 2 +- gramps2/src/plugins/WebPage.py | 12 +- gramps2/src/plugins/WriteCD.py | 16 +- gramps2/src/plugins/WriteGedcom.py | 2 +- gramps2/src/plugins/WritePkg.py | 16 +- gramps2/src/po/Makefile.in | 123 ++--- 63 files changed, 1701 insertions(+), 2719 deletions(-) diff --git a/gramps2/Makefile.in b/gramps2/Makefile.in index 2f5eea879..25785a7d0 100644 --- a/gramps2/Makefile.in +++ b/gramps2/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7.8 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, @@ -15,75 +15,73 @@ @SET_MAKE@ # copyright (C) 2000 Sun Microsystems, Inc. +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@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EXEEXT = @EXEEXT@ GNOMEHELP = @GNOMEHELP@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ ICONV = @ICONV@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LANGUAGES = @LANGUAGES@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ MOFILES = @MOFILES@ MSGCONV = @MSGCONV@ MSGFMT = @MSGFMT@ -OBJEXT = @OBJEXT@ 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@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ @@ -93,43 +91,18 @@ 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@ 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@ SUBDIRS = src doc example @@ -146,15 +119,14 @@ SCRIPTS = $(bin_SCRIPTS) DIST_SOURCES = -RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ - ps-recursive install-info-recursive uninstall-info-recursive \ - all-recursive install-data-recursive install-exec-recursive \ - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive -DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \ - COPYING ChangeLog INSTALL Makefile.am NEWS TODO aclocal.m4 \ - configure configure.in gramps-mdk.spec.in gramps.sh.in \ - gramps.spec.in install-sh missing mkinstalldirs py-compile +RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ + uninstall-info-recursive all-recursive install-data-recursive \ + install-exec-recursive installdirs-recursive install-recursive \ + uninstall-recursive check-recursive installcheck-recursive +DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ + Makefile.in NEWS TODO aclocal.m4 configure configure.in \ + gramps-mdk.spec.in gramps.sh.in gramps.spec.in install-sh \ + missing mkinstalldirs py-compile DIST_SUBDIRS = $(SUBDIRS) all: all-recursive @@ -257,17 +229,10 @@ tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done ETAGS = etags ETAGSFLAGS = -CTAGS = ctags -CTAGSFLAGS = - tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -283,15 +248,9 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - if (etags --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - else \ - include_option=--include; \ - fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ fi; \ done; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -304,28 +263,13 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = . @@ -337,20 +281,13 @@ am__remove_distdir = \ && rm -fr $(distdir); }; } GZIP_ENV = --best -distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) $(mkinstalldirs) $(distdir)/. $(distdir)/src - @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 \ @@ -403,13 +340,12 @@ distcheck: dist $(am__remove_distdir) GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + mkdir $(distdir)/=build + mkdir $(distdir)/=inst chmod a-w $(distdir) - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && cd $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \ + && cd $(distdir)/=build \ + && ../configure --srcdir=.. --prefix=$$dc_install_base \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ @@ -417,39 +353,23 @@ distcheck: dist && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ - && ({ \ - (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ - } || { rm -rf "$$dc_destdir"; exit 1; }) \ - && rm -rf "$$dc_destdir" \ + && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \ + || { echo "ERROR: files left after uninstall:" ; \ + find $$dc_install_base -type f -print ; \ + exit 1; } >&2 ) \ && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ && rm -f $(distdir).tar.gz \ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck $(am__remove_distdir) @echo "$(distdir).tar.gz is ready for distribution" | \ sed 'h;s/./=/g;p;x;p;x' -distuninstallcheck: - @cd $(distuninstallcheck_dir) \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ - || { echo "ERROR: files left after uninstall:" ; \ - if test -n "$(DESTDIR)"; then \ - echo " (check DESTDIR support)"; \ - fi ; \ - $(distuninstallcheck_listfiles) ; \ - exit 1; } >&2 distcleancheck: distclean - @if test '$(srcdir)' = . ; then \ + if test '$(srcdir)' = . ; then \ echo "ERROR: distcleancheck can only run from a VPATH build" ; \ exit 1 ; \ fi - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left in build directory after distclean:" ; \ + test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left after distclean:" ; \ $(distcleancheck_listfiles) ; \ exit 1; } >&2 check-am: all-am @@ -479,7 +399,7 @@ clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -490,7 +410,6 @@ clean-am: clean-generic mostlyclean-am distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -f Makefile distclean-am: clean-am distclean-generic distclean-tags dvi: dvi-recursive @@ -513,31 +432,21 @@ installcheck-am: maintainer-clean: maintainer-clean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf $(top_srcdir)/autom4te.cache - -rm -f Makefile + -rm -rf autom4te.cache maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-recursive mostlyclean-am: mostlyclean-generic -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - uninstall-am: uninstall-binSCRIPTS uninstall-info-am uninstall-info: uninstall-info-recursive -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ - clean-generic clean-recursive ctags ctags-recursive dist \ - dist-all dist-gzip distcheck distclean distclean-generic \ - distclean-recursive distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am dvi-recursive info info-am \ +.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ + clean-generic clean-recursive dist dist-all dist-gzip distcheck \ + distclean distclean-generic distclean-recursive distclean-tags \ + distcleancheck distdir dvi dvi-am dvi-recursive info info-am \ info-recursive install install-am install-binSCRIPTS \ install-data install-data-am install-data-recursive \ install-exec install-exec-am install-exec-recursive \ @@ -546,10 +455,9 @@ uninstall-info: uninstall-info-recursive installdirs installdirs-am installdirs-recursive \ maintainer-clean maintainer-clean-generic \ maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \ - ps-recursive tags tags-recursive uninstall uninstall-am \ - uninstall-binSCRIPTS uninstall-info-am uninstall-info-recursive \ - uninstall-recursive + mostlyclean-recursive tags tags-recursive uninstall \ + uninstall-am uninstall-binSCRIPTS uninstall-info-am \ + uninstall-info-recursive uninstall-recursive gramps: gramps.sh diff --git a/gramps2/aclocal.m4 b/gramps2/aclocal.m4 index 90e35a794..1d6b76985 100644 --- a/gramps2/aclocal.m4 +++ b/gramps2/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.7.8 -*- Autoconf -*- +# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,7 +16,7 @@ # This macro actually does too much some checks are only needed if # your package does certain things. But this isn't really a big deal. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -34,9 +34,16 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. -# serial 10 +# serial 8 -AC_PREREQ([2.54]) +# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... + + +AC_PREREQ([2.52]) # Autoconf 2.50 wants to disallow AM_ names. We explicitly allow # the ones we care about. @@ -62,16 +69,6 @@ if test "`cd $srcdir && pwd`" != "`pwd`" && AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) fi -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi -AC_SUBST([CYGPATH_W]) - # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], @@ -79,8 +76,8 @@ m4_ifval([$2], AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl + AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl + AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl _AM_IF_OPTION([no-define],, [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) @@ -101,41 +98,19 @@ AM_PROG_INSTALL_STRIP # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_SET_LEADING_DOT])dnl _AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], +[AC_PROVIDE_IFELSE([AC_PROG_][CC], [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], + [define([AC_PROG_][CC], + defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_][CXX], [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [define([AC_PROG_][CXX], + defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl ]) ]) - -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. The stamp files are numbered to have different names. - -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -# loop where config.status creates the headers, so we can generate -# our stamp files there. -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -[# Compute $1's index in $config_headers. -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $1 | $1:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) - # Copyright 2002 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -156,14 +131,14 @@ echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"]) +AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"]) # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.7.8])]) + [AM_AUTOMAKE_VERSION([1.6.3])]) # Helper functions for option handling. -*- Autoconf -*- @@ -449,42 +424,9 @@ fi INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# -*- Autoconf -*- -# Copyright (C) 2003 Free Software Foundation, Inc. +# serial 4 -*- Autoconf -*- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 1 - -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) - -# serial 5 -*- Autoconf -*- - -# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# Copyright 1999, 2000, 2001 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -545,32 +487,18 @@ AC_CACHE_CHECK([dependency style of $depcc], # using a relative directory. cp "$am_depcomp" conftest.dir cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub am_cv_$1_dependencies_compiler_type=none if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` fi for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # # We need to recreate these files for each test, as the compiler may # overwrite some of them when testing with obscure command lines. # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - : > sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + echo '#include "conftest.h"' > conftest.c + echo 'int i;' > conftest.h + echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf case $depmode in nosideeffect) @@ -588,20 +516,13 @@ AC_CACHE_CHECK([dependency style of $depcc], # mode. It turns out that the SunPro C++ compiler does not properly # handle `-M -o', and we need to detect this. if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + source=conftest.c object=conftest.o \ + depfile=conftest.Po tmpdepfile=conftest.TPo \ + $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && + grep conftest.h conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # (even with -Werror). So we grep stderr for any message - # that says an option was ignored. - if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else - am_cv_$1_dependencies_compiler_type=$depmode - break - fi + am_cv_$1_dependencies_compiler_type=$depmode + break fi done @@ -612,9 +533,6 @@ else fi ]) AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -AM_CONDITIONAL([am__fastdep$1], [ - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) ]) @@ -623,8 +541,16 @@ AM_CONDITIONAL([am__fastdep$1], [ # Choose a directory name for dependency files. # This macro is AC_REQUIREd in _AM_DEPENDENCIES AC_DEFUN([AM_SET_DEPDIR], -[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +[rm -f .deps 2>/dev/null +mkdir .deps 2>/dev/null +if test -d .deps; then + DEPDIR=.deps +else + # MS-DOS does not allow filenames that begin with a dot. + DEPDIR=_deps +fi +rmdir .deps 2>/dev/null +AC_SUBST([DEPDIR]) ]) @@ -726,9 +652,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Check to see how 'make' treats includes. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. +# Copyright 2001 Free Software Foundation, Inc. -*- Autoconf -*- # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -753,9 +677,8 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], AC_DEFUN([AM_MAKE_INCLUDE], [am_make=${MAKE-make} cat > confinc << 'END' -am__doit: +doit: @echo done -.PHONY: am__doit END # If we don't find an include directive, just comment out the code. AC_MSG_CHECKING([for style of include used by $am_make]) @@ -769,7 +692,7 @@ echo "include confinc" > confmf # In particular we don't look at `^make:' because GNU make might # be invoked under some other name (usually "gmake"), in which # case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then +if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then am__include=include am__quote= _am_result=GNU @@ -783,9 +706,9 @@ if test "$am__include" = "#"; then _am_result=BSD fi fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) +AC_SUBST(am__include) +AC_SUBST(am__quote) +AC_MSG_RESULT($_am_result) rm -f confinc confmf ]) @@ -829,7 +752,7 @@ else fi AC_CONFIG_COMMANDS_PRE( [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([conditional "$1" was never defined. + AC_MSG_ERROR([conditional \"$1\" was never defined. Usually this means the macro was only invoked conditionally.]) fi])]) @@ -869,7 +792,7 @@ fi])]) # environment variable, or create a .pth file (see the python # documentation for details). -# If the MINIMUM-VERSION argument is passed, AM_PATH_PYTHON will +# If the MINIUMUM-VERSION argument is passed, AM_PATH_PYTHON will # cause an error if the version of python installed on the system # doesn't meet the requirement. MINIMUM-VERSION should consist of # numbers and dots only. @@ -881,14 +804,12 @@ AC_DEFUN([AM_PATH_PYTHON], dnl $prefix/lib/site-python in 1.4 to $prefix/lib/python1.5/site-packages dnl in 1.5. m4_define([_AM_PYTHON_INTERPRETER_LIST], - [python python2 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5]) + [python python2 python2.2 python2.1 python2.0 python1.6 python1.5]) m4_if([$1],[],[ dnl No version check is needed. # Find any Python interpreter. - AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST) - am_display_PYTHON=python - ], [ + AC_PATH_PROG([PYTHON], _AM_PYTHON_INTERPRETER_LIST)],[ dnl A version check is needed. if test -n "$PYTHON"; then # If the user set $PYTHON, use it and don't search something else. @@ -909,7 +830,6 @@ AC_DEFUN([AM_PATH_PYTHON], done]) # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON]) - am_display_PYTHON=$am_cv_pathless_PYTHON fi ]) @@ -917,7 +837,7 @@ AC_DEFUN([AM_PATH_PYTHON], dnl the best way to do this; it's what "site.py" does in the standard dnl library. - AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version], + AC_CACHE_CHECK([for $am_cv_pathless_PYTHON version], [am_cv_python_version], [am_cv_python_version=`$PYTHON -c "import sys; print sys.version[[:3]]"`]) AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) @@ -932,7 +852,8 @@ AC_DEFUN([AM_PATH_PYTHON], dnl At times (like when building shared libraries) you may want dnl to know which OS platform Python thinks this is. - AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform], + AC_CACHE_CHECK([for $am_cv_pathless_PYTHON platform], + [am_cv_python_platform], [am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`]) AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform]) @@ -941,8 +862,9 @@ AC_DEFUN([AM_PATH_PYTHON], dnl pythondir -- where to install python scripts. This is the dnl site-packages directory, not the python standard library - dnl directory like in previous automake betas. This behavior + dnl directory like in previous automake betas. This behaviour dnl is more consistent with lispdir.m4 for example. + dnl Query distutils for this directory. distutils does not exist in dnl Python 1.5, so we fall back to the hardcoded directory if it dnl doesn't work. @@ -979,7 +901,7 @@ AC_DEFUN([AM_PATH_PYTHON], # --------------------------------------------------------------------------- # Run ACTION-IF-TRUE if the Python interpreter PROG has version >= VERSION. # Run ACTION-IF-FALSE otherwise. -# This test uses sys.hexversion instead of the string equivalent (first +# This test uses sys.hexversion instead of the string equivalant (first # word of sys.version), in order to cope with versions such as 2.2c1. # hexversion has been introduced in Python 1.5.2; it's probably not # worth to support older versions (1.5.1 was released on October 31, 1998). diff --git a/gramps2/configure b/gramps2/configure index 080f64f65..439b26731 100755 --- a/gramps2/configure +++ b/gramps2/configure @@ -1,10 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for gramps 1.1.0. +# Generated by GNU Autoconf 2.57 for gramps 1.1.0. # # Report bugs to . # -# Copyright (C) 2003 Free Software Foundation, Inc. +# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## @@ -21,10 +22,9 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi -DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then as_unset=unset else as_unset=false @@ -43,7 +43,7 @@ for as_var in \ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ LC_TELEPHONE LC_TIME do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else $as_unset $as_var @@ -220,17 +220,16 @@ rm -f conf$$ conf$$.exe conf$$.file if mkdir -p . 2>/dev/null; then as_mkdir_p=: else - test -d ./-p && rmdir ./-p as_mkdir_p=false fi as_executable_p="test -f" # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" # Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" # IFS @@ -633,7 +632,7 @@ done # Be sure to have absolute paths. for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir + localstatedir libdir includedir oldincludedir infodir mandir do eval ac_val=$`echo $ac_var` case $ac_val in @@ -673,10 +672,10 @@ if test -z "$srcdir"; then # Try the directory containing this script, then its parent. ac_confdir=`(dirname "$0") 2>/dev/null || $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$0" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -764,9 +763,9 @@ _ACEOF cat <<_ACEOF Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] + [$ac_default_prefix] --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] + [PREFIX] By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify @@ -856,45 +855,12 @@ case $srcdir in ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac +# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be +# absolute. +ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` +ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` +ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` +ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` cd $ac_dir # Check for guested configure; otherwise get Cygnus style configure. @@ -905,13 +871,13 @@ esac echo $SHELL $ac_srcdir/configure --help=recursive elif test -f $ac_srcdir/configure.ac || - test -f $ac_srcdir/configure.in; then + test -f $ac_srcdir/configure.in; then echo $ac_configure --help else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi - cd "$ac_popdir" + cd $ac_popdir done fi @@ -919,9 +885,10 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF gramps configure 1.1.0 -generated by GNU Autoconf 2.59 +generated by GNU Autoconf 2.57 -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 +Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -933,7 +900,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by gramps $as_me 1.1.0, which was -generated by GNU Autoconf 2.59. Invocation command line was +generated by GNU Autoconf 2.57. Invocation command line was $ $0 $@ @@ -1010,19 +977,19 @@ do 2) ac_configure_args1="$ac_configure_args1 '$ac_arg'" if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. + ac_must_keep_next=false # Got value, back to normal. else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac fi ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" # Get rid of the leading space. @@ -1056,12 +1023,12 @@ _ASBOX case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in *ac_space=\ *) sed -n \ - "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" + "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" ;; *) sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; } @@ -1090,7 +1057,7 @@ _ASBOX for ac_var in $ac_subst_files do eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" + echo "$ac_var='"'"'$ac_val'"'"'" done | sort echo fi @@ -1109,7 +1076,7 @@ _ASBOX echo "$as_me: caught signal $ac_signal" echo "$as_me: exit $exit_status" } >&5 - rm -f core *.core && + rm -f core core.* *.core && rm -rf conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status ' 0 @@ -1189,7 +1156,7 @@ fi # value. ac_cache_corrupted=false for ac_var in `(set) 2>&1 | - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do + sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do eval ac_old_set=\$ac_cv_env_${ac_var}_set eval ac_new_set=\$ac_env_${ac_var}_set eval ac_old_val="\$ac_cv_env_${ac_var}_value" @@ -1206,13 +1173,13 @@ echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 + { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 + { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: + ac_cache_corrupted=: fi;; esac # Pass precious variables to config.status. @@ -1306,7 +1273,6 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 @@ -1323,7 +1289,6 @@ do case $as_dir/ in ./ | .// | /cC/* | \ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ /usr/ucb/* ) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. @@ -1331,20 +1296,20 @@ case $as_dir/ in # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi done done ;; @@ -1488,7 +1453,7 @@ done echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` +set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1895,13 +1860,12 @@ else echo "${ECHO_T}no" >&6 fi - am_display_PYTHON=$am_cv_pathless_PYTHON fi - echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5 -echo $ECHO_N "checking for $am_display_PYTHON version... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for $am_cv_pathless_PYTHON version" >&5 +echo $ECHO_N "checking for $am_cv_pathless_PYTHON version... $ECHO_C" >&6 if test "${am_cv_python_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1919,8 +1883,8 @@ echo "${ECHO_T}$am_cv_python_version" >&6 - echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5 -echo $ECHO_N "checking for $am_display_PYTHON platform... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for $am_cv_pathless_PYTHON platform" >&5 +echo $ECHO_N "checking for $am_cv_pathless_PYTHON platform... $ECHO_C" >&6 if test "${am_cv_python_platform+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1934,15 +1898,34 @@ echo "${ECHO_T}$am_cv_python_platform" >&6 - pythondir=$PYTHON_PREFIX"/lib/python"$PYTHON_VERSION/site-packages + echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5 +echo $ECHO_N "checking for $am_display_PYTHON script directory... $ECHO_C" >&6 +if test "${am_cv_python_pythondir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null || + echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` +fi +echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5 +echo "${ECHO_T}$am_cv_python_pythondir" >&6 + pythondir=$am_cv_python_pythondir pkgpythondir=\${pythondir}/$PACKAGE - - pyexecdir=${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages + echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5 +echo $ECHO_N "checking for $am_display_PYTHON extension module directory... $ECHO_C" >&6 +if test "${am_cv_python_pyexecdir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null || + echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"` +fi +echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5 +echo "${ECHO_T}$am_cv_python_pyexecdir" >&6 + pyexecdir=$am_cv_python_pyexecdir @@ -2370,6 +2353,7 @@ ac_compiler=`set X $ac_compile; echo $2` (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2389,8 +2373,8 @@ ac_clean_files="$ac_clean_files a.out a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for C compiler default output" >&5 +echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 @@ -2410,23 +2394,23 @@ do test -f "$ac_file" || continue case $ac_file in *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) - ;; + ;; conftest.$ac_ext ) - # This is the source file. - ;; + # This is the source file. + ;; [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; + # We found the default executable, but exeext='' is most + # certainly right. + break;; *.* ) - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool, - # but it would be cool to find out if it's true. Does anybody - # maintain Libtool? --akim. - export ac_cv_exeext - break;; + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + # FIXME: I believe we export ac_cv_exeext for Libtool, + # but it would be cool to find out if it's true. Does anybody + # maintain Libtool? --akim. + export ac_cv_exeext + break;; * ) - break;; + break;; esac done else @@ -2500,8 +2484,8 @@ for ac_file in conftest.exe conftest conftest.*; do case $ac_file in *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - export ac_cv_exeext - break;; + export ac_cv_exeext + break;; * ) break;; esac done @@ -2526,6 +2510,7 @@ if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2576,6 +2561,7 @@ if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2595,20 +2581,11 @@ main () _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 2>&5 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2621,7 +2598,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_compiler_gnu=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi @@ -2637,6 +2614,7 @@ if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2653,20 +2631,11 @@ main () _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 2>&5 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2679,7 +2648,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_prog_cc_g=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 @@ -2706,6 +2675,7 @@ else ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2733,16 +2703,6 @@ static char *f (char * (*g) (char **, int), char **p, ...) va_end (v); return s; } - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std1 is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std1. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - int test (int i, double x); struct s1 {int (*f) (int a);}; struct s2 {int (*f) (double a);}; @@ -2769,20 +2729,11 @@ do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 2>&5 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2795,7 +2746,7 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext +rm -f conftest.$ac_objext done rm -f conftest.$ac_ext conftest.$ac_objext CC=$ac_save_CC @@ -2823,27 +2774,19 @@ cat >conftest.$ac_ext <<_ACEOF _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 2>&5 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ - '' \ + ''\ + '#include ' \ 'extern "C" void std::exit (int) throw (); using std::exit;' \ 'extern "C" void std::exit (int); using std::exit;' \ 'extern "C" void exit (int) throw ();' \ @@ -2851,13 +2794,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_declaration #include +$ac_declaration int main () { @@ -2868,20 +2812,11 @@ exit (42); _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 2>&5 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2894,8 +2829,9 @@ sed 's/^/| /' conftest.$ac_ext >&5 continue fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2912,20 +2848,11 @@ exit (42); _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 2>&5 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2937,7 +2864,7 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext done rm -f conftest* if test -n "$ac_declaration"; then @@ -2951,7 +2878,7 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -3426,13 +3353,13 @@ _ACEOF # `set' does not quote correctly, so add quotes (double-quote # substitution turns \\\\ into \\, and sed turns \\ into \). sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" ;; *) # `set' quotes correctly as required by POSIX, so do not add quotes. sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; } | @@ -3462,13 +3389,13 @@ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ + ac_vpsub='/^[ ]*VPATH[ ]*=/{ s/:*\$(srcdir):*/:/; s/:*\${srcdir}:*/:/; s/:*@srcdir@:*/:/; -s/^\([^=]*=[ ]*\):*/\1/; +s/^\([^=]*=[ ]*\):*/\1/; s/:*$//; -s/^[^=]*=[ ]*$//; +s/^[^=]*=[ ]*$//; }' fi @@ -3482,13 +3409,13 @@ fi cat >confdef2opt.sed <<\_ACEOF t clear : clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g t quote -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g t quote d : quote -s,[ `~#$^&*(){}\\|;'"<>?],\\&,g +s,[ `~#$^&*(){}\\|;'"<>?],\\&,g s,\[,\\&,g s,\],\\&,g s,\$,$$,g @@ -3510,7 +3437,7 @@ ac_ltlibobjs= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_i=`echo "$ac_i" | - sed 's/\$U\././;s/\.o$//;s/\.obj$//'` + sed 's/\$U\././;s/\.o$//;s/\.obj$//'` # 2. Add them. ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' @@ -3561,10 +3488,9 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi -DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then as_unset=unset else as_unset=false @@ -3583,7 +3509,7 @@ for as_var in \ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ LC_TELEPHONE LC_TIME do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else $as_unset $as_var @@ -3762,17 +3688,16 @@ rm -f conf$$ conf$$.exe conf$$.file if mkdir -p . 2>/dev/null; then as_mkdir_p=: else - test -d ./-p && rmdir ./-p as_mkdir_p=false fi as_executable_p="test -f" # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" # Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" # IFS @@ -3799,7 +3724,7 @@ _ASBOX cat >&5 <<_CSEOF This file was extended by gramps $as_me 1.1.0, which was -generated by GNU Autoconf 2.59. Invocation command line was +generated by GNU Autoconf 2.57. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -3843,7 +3768,7 @@ Usage: $0 [OPTIONS] [FILE]... -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] - instantiate the configuration file FILE + instantiate the configuration file FILE Configuration files: $config_files @@ -3857,10 +3782,11 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ gramps config.status 1.1.0 -configured by $0, generated by GNU Autoconf 2.59, +configured by $0, generated by GNU Autoconf 2.57, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." srcdir=$srcdir @@ -4160,9 +4086,9 @@ _ACEOF (echo ':t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" + ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" else - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" + ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" fi ac_sed_frag=`expr $ac_sed_frag + 1` ac_beg=$ac_end @@ -4180,21 +4106,21 @@ for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case $ac_file in - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + cat >$tmp/stdin + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; * ) ac_file_in=$ac_file.in ;; esac # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. ac_dir=`(dirname "$ac_file") 2>/dev/null || $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -4210,10 +4136,10 @@ echo X"$ac_file" | as_dirs="$as_dir $as_dirs" as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -4251,45 +4177,12 @@ case $srcdir in ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac +# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be +# absolute. +ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` +ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` +ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` +ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` case $INSTALL in @@ -4297,6 +4190,11 @@ esac *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac + if test x"$ac_file" != x-; then + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ @@ -4306,7 +4204,7 @@ esac configure_input="$ac_file. " fi configure_input=$configure_input"Generated from `echo $ac_file_in | - sed 's,.*/,,'` by configure." + sed 's,.*/,,'` by configure." # First look for the input files in the build tree, otherwise in the # src tree. @@ -4315,32 +4213,26 @@ esac case $f in -) echo $tmp/stdin ;; [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 + # Absolute (can't be DOS-style, as IFS=:) + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } - echo "$f";; + echo $f;; *) # Relative - if test -f "$f"; then - # Build tree - echo "$f" - elif test -f "$srcdir/$f"; then - # Source tree - echo "$srcdir/$f" - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 + if test -f "$f"; then + # Build tree + echo $f + elif test -f "$srcdir/$f"; then + # Source tree + echo $srcdir/$f + else + # /dev/null tree + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } - fi;; + fi;; esac done` || { (exit 1); exit 1; } - - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub @@ -4380,41 +4272,16 @@ for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` ac_dir=`(dirname "$ac_dest") 2>/dev/null || $as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_dest" : 'X\(//\)[^/]' \| \ - X"$ac_dest" : 'X\(//\)$' \| \ - X"$ac_dest" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$ac_dest" : 'X\(//\)[^/]' \| \ + X"$ac_dest" : 'X\(//\)$' \| \ + X"$ac_dest" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$ac_dest" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - ac_builddir=. if test "$ac_dir" != .; then @@ -4440,45 +4307,12 @@ case $srcdir in ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac +# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be +# absolute. +ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` +ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` +ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` +ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 @@ -4496,10 +4330,10 @@ echo "$as_me: executing $ac_dest commands" >&6;} if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then dirpart=`(dirname "$mf") 2>/dev/null || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ + X"$mf" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -4535,10 +4369,10 @@ echo X"$mf" | test -f "$dirpart/$file" && continue fdir=`(dirname "$file") 2>/dev/null || $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ + X"$file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -4554,10 +4388,10 @@ echo X"$file" | as_dirs="$as_dir $as_dirs" as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } diff --git a/gramps2/doc/Makefile.in b/gramps2/doc/Makefile.in index fd1d21691..4fc8b41f2 100644 --- a/gramps2/doc/Makefile.in +++ b/gramps2/doc/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7.8 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, @@ -15,75 +15,73 @@ @SET_MAKE@ # Process this file with automake to produce Makefile.in +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@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EXEEXT = @EXEEXT@ GNOMEHELP = @GNOMEHELP@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ ICONV = @ICONV@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LANGUAGES = @LANGUAGES@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ MOFILES = @MOFILES@ MSGCONV = @MSGCONV@ MSGFMT = @MSGFMT@ -OBJEXT = @OBJEXT@ 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@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ @@ -93,43 +91,18 @@ 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@ 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@ SUBDIRS = gramps-manual @@ -140,7 +113,6 @@ EXTRA_DIST = $(man_MANS) $(man_IN_FILES) xmldocs.make omf.make CLEANFILES = $(man_MANS) subdir = doc -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = DIST_SOURCES = @@ -148,12 +120,11 @@ DIST_SOURCES = NROFF = nroff MANS = $(man_MANS) -RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ - ps-recursive install-info-recursive uninstall-info-recursive \ - all-recursive install-data-recursive install-exec-recursive \ - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive -DIST_COMMON = $(srcdir)/Makefile.in Makefile.am +RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ + uninstall-info-recursive all-recursive install-data-recursive \ + install-exec-recursive installdirs-recursive install-recursive \ + uninstall-recursive check-recursive installcheck-recursive +DIST_COMMON = Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) all: all-recursive @@ -201,10 +172,6 @@ uninstall-man1: done; \ for i in $$list; do \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - case "$$ext" in \ - 1*) ;; \ - *) ext='1' ;; \ - esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -266,17 +233,10 @@ tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done ETAGS = etags ETAGSFLAGS = -CTAGS = ctags -CTAGSFLAGS = - tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -292,15 +252,9 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - if (etags --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - else \ - include_option=--include; \ - fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ fi; \ done; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -313,41 +267,20 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @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 \ @@ -407,7 +340,7 @@ clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -417,7 +350,7 @@ clean: clean-recursive clean-am: clean-generic mostlyclean-am distclean: distclean-recursive - -rm -f Makefile + distclean-am: clean-am distclean-generic distclean-tags dvi: dvi-recursive @@ -439,42 +372,33 @@ install-man: install-man1 installcheck-am: maintainer-clean: maintainer-clean-recursive - -rm -f Makefile + maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-recursive mostlyclean-am: mostlyclean-generic -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - uninstall-am: uninstall-info-am uninstall-man uninstall-info: uninstall-info-recursive uninstall-man: uninstall-man1 -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ - clean-generic clean-recursive ctags ctags-recursive distclean \ - distclean-generic distclean-recursive distclean-tags distdir \ - dvi dvi-am dvi-recursive info info-am info-recursive install \ - install-am install-data install-data-am install-data-recursive \ +.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ + clean-generic clean-recursive distclean distclean-generic \ + distclean-recursive distclean-tags distdir dvi dvi-am \ + dvi-recursive info info-am info-recursive install install-am \ + install-data install-data-am install-data-recursive \ install-exec install-exec-am install-exec-recursive \ install-info install-info-am install-info-recursive install-man \ install-man1 install-recursive install-strip installcheck \ installcheck-am installdirs installdirs-am \ installdirs-recursive maintainer-clean maintainer-clean-generic \ maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \ - ps-recursive tags tags-recursive uninstall uninstall-am \ - uninstall-info-am uninstall-info-recursive uninstall-man \ - uninstall-man1 uninstall-recursive + mostlyclean-recursive tags tags-recursive uninstall \ + uninstall-am uninstall-info-am uninstall-info-recursive \ + uninstall-man uninstall-man1 uninstall-recursive gramps.1: $(top_builddir)/config.status gramps.1.in diff --git a/gramps2/doc/gramps-manual/C/Makefile.in b/gramps2/doc/gramps-manual/C/Makefile.in index 3cba79cc1..15ed38555 100644 --- a/gramps2/doc/gramps-manual/C/Makefile.in +++ b/gramps2/doc/gramps-manual/C/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7.8 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,75 +75,73 @@ # 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@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EXEEXT = @EXEEXT@ GNOMEHELP = @GNOMEHELP@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ ICONV = @ICONV@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LANGUAGES = @LANGUAGES@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ MOFILES = @MOFILES@ MSGCONV = @MSGCONV@ MSGFMT = @MSGFMT@ -OBJEXT = @OBJEXT@ 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@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ @@ -153,43 +151,18 @@ 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@ 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 @@ -221,12 +194,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 = $(srcdir)/Makefile.in $(top_srcdir)/doc/omf.make \ - $(top_srcdir)/doc/xmldocs.make Makefile.am +DIST_COMMON = Makefile.am Makefile.in all: all-am .SUFFIXES: @@ -239,23 +210,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 \ @@ -276,13 +237,14 @@ 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 all-am: Makefile installdirs: + install: install-am install-exec: install-exec-am install-data: install-data-am @@ -303,7 +265,7 @@ clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -313,7 +275,7 @@ clean: clean-am clean-am: clean-generic mostlyclean-am distclean: distclean-am - -rm -f Makefile + distclean-am: clean-am distclean-generic dvi: dvi-am @@ -337,21 +299,13 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f Makefile + maintainer-clean-am: distclean-am maintainer-clean-generic 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 \ @@ -360,8 +314,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 diff --git a/gramps2/doc/gramps-manual/Makefile.in b/gramps2/doc/gramps-manual/Makefile.in index 3095568a1..8e97f5176 100644 --- a/gramps2/doc/gramps-manual/Makefile.in +++ b/gramps2/doc/gramps-manual/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7.8 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, @@ -15,75 +15,73 @@ @SET_MAKE@ # Process this file with automake to produce Makefile.in +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@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EXEEXT = @EXEEXT@ GNOMEHELP = @GNOMEHELP@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ ICONV = @ICONV@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LANGUAGES = @LANGUAGES@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ MOFILES = @MOFILES@ MSGCONV = @MSGCONV@ MSGFMT = @MSGFMT@ -OBJEXT = @OBJEXT@ 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@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ @@ -93,57 +91,30 @@ 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@ 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@ SUBDIRS = C fr ru subdir = doc/gramps-manual -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = DIST_SOURCES = -RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ - ps-recursive install-info-recursive uninstall-info-recursive \ - all-recursive install-data-recursive install-exec-recursive \ - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive -DIST_COMMON = $(srcdir)/Makefile.in Makefile.am +RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ + uninstall-info-recursive all-recursive install-data-recursive \ + install-exec-recursive installdirs-recursive install-recursive \ + uninstall-recursive check-recursive installcheck-recursive +DIST_COMMON = Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) all: all-recursive @@ -209,17 +180,10 @@ tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done ETAGS = etags ETAGSFLAGS = -CTAGS = ctags -CTAGSFLAGS = - tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -235,15 +199,9 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - if (etags --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - else \ - include_option=--include; \ - fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ fi; \ done; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -256,41 +214,20 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @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 \ @@ -348,7 +285,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -358,7 +295,7 @@ clean: clean-recursive clean-am: clean-generic mostlyclean-am distclean: distclean-recursive - -rm -f Makefile + distclean-am: clean-am distclean-generic distclean-tags dvi: dvi-recursive @@ -380,39 +317,31 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-recursive - -rm -f Makefile + maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-recursive mostlyclean-am: mostlyclean-generic -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - uninstall-am: uninstall-info-am uninstall-info: uninstall-info-recursive -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ - clean-generic clean-recursive ctags ctags-recursive distclean \ - distclean-generic distclean-recursive distclean-tags distdir \ - dvi dvi-am dvi-recursive info info-am info-recursive install \ - install-am install-data install-data-am install-data-recursive \ +.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ + clean-generic clean-recursive distclean distclean-generic \ + distclean-recursive distclean-tags distdir dvi dvi-am \ + dvi-recursive info info-am info-recursive install install-am \ + install-data install-data-am install-data-recursive \ install-exec install-exec-am install-exec-recursive \ install-info install-info-am install-info-recursive install-man \ install-recursive install-strip installcheck installcheck-am \ installdirs installdirs-am installdirs-recursive \ maintainer-clean maintainer-clean-generic \ maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \ - ps-recursive tags tags-recursive uninstall uninstall-am \ - uninstall-info-am uninstall-info-recursive uninstall-recursive + mostlyclean-recursive tags tags-recursive uninstall \ + uninstall-am uninstall-info-am uninstall-info-recursive \ + uninstall-recursive # 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. diff --git a/gramps2/doc/gramps-manual/fr/Makefile.in b/gramps2/doc/gramps-manual/fr/Makefile.in index 126415f75..64d693af3 100644 --- a/gramps2/doc/gramps-manual/fr/Makefile.in +++ b/gramps2/doc/gramps-manual/fr/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7.8 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,75 +75,73 @@ # 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@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EXEEXT = @EXEEXT@ GNOMEHELP = @GNOMEHELP@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ ICONV = @ICONV@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LANGUAGES = @LANGUAGES@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ MOFILES = @MOFILES@ MSGCONV = @MSGCONV@ MSGFMT = @MSGFMT@ -OBJEXT = @OBJEXT@ 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@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ @@ -153,43 +151,18 @@ 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@ 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 = fr @@ -221,12 +194,10 @@ CLEANFILES = omf_timestamp *.out omf_dest_dir = $(datadir)/omf/@PACKAGE@ scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper subdir = doc/gramps-manual/fr -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = DIST_SOURCES = -DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/doc/omf.make \ - $(top_srcdir)/doc/xmldocs.make Makefile.am +DIST_COMMON = Makefile.am Makefile.in all: all-am .SUFFIXES: @@ -239,23 +210,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 \ @@ -276,13 +237,14 @@ 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 all-am: Makefile installdirs: + install: install-am install-exec: install-exec-am install-data: install-data-am @@ -303,7 +265,7 @@ clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -313,7 +275,7 @@ clean: clean-am clean-am: clean-generic mostlyclean-am distclean: distclean-am - -rm -f Makefile + distclean-am: clean-am distclean-generic dvi: dvi-am @@ -337,21 +299,13 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f Makefile + maintainer-clean-am: distclean-am maintainer-clean-generic 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 \ @@ -360,8 +314,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 diff --git a/gramps2/doc/gramps-manual/ru/Makefile.in b/gramps2/doc/gramps-manual/ru/Makefile.in index 64fd9c74f..db622e0cd 100644 --- a/gramps2/doc/gramps-manual/ru/Makefile.in +++ b/gramps2/doc/gramps-manual/ru/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7.8 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,75 +75,73 @@ # 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@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EXEEXT = @EXEEXT@ GNOMEHELP = @GNOMEHELP@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ ICONV = @ICONV@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LANGUAGES = @LANGUAGES@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ MOFILES = @MOFILES@ MSGCONV = @MSGCONV@ MSGFMT = @MSGFMT@ -OBJEXT = @OBJEXT@ 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@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ @@ -153,43 +151,18 @@ 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@ 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 = ru @@ -221,12 +194,10 @@ CLEANFILES = omf_timestamp *.out omf_dest_dir = $(datadir)/omf/@PACKAGE@ scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper subdir = doc/gramps-manual/ru -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = DIST_SOURCES = -DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/doc/omf.make \ - $(top_srcdir)/doc/xmldocs.make Makefile.am +DIST_COMMON = Makefile.am Makefile.in all: all-am .SUFFIXES: @@ -239,23 +210,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 \ @@ -276,13 +237,14 @@ 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 all-am: Makefile installdirs: + install: install-am install-exec: install-exec-am install-data: install-data-am @@ -303,7 +265,7 @@ clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -313,7 +275,7 @@ clean: clean-am clean-am: clean-generic mostlyclean-am distclean: distclean-am - -rm -f Makefile + distclean-am: clean-am distclean-generic dvi: dvi-am @@ -337,21 +299,13 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f Makefile + maintainer-clean-am: distclean-am maintainer-clean-generic 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 \ @@ -360,8 +314,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 diff --git a/gramps2/doc/gramps.1 b/gramps2/doc/gramps.1 index 89fb250ce..08a4e0854 100644 --- a/gramps2/doc/gramps.1 +++ b/gramps2/doc/gramps.1 @@ -1,4 +1,4 @@ -.TH gramps 1 "0.99" "February 2004" "0.99" +.TH gramps 1 "1.1.0" "February 2004" "1.1.0" .SH NAME gramps \- Genealogical Research and Analysis Management Programming System. diff --git a/gramps2/example/Makefile.in b/gramps2/example/Makefile.in index a3fdafc6d..ae21e2403 100644 --- a/gramps2/example/Makefile.in +++ b/gramps2/example/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7.8 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, @@ -13,75 +13,73 @@ # PARTICULAR PURPOSE. @SET_MAKE@ +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@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EXEEXT = @EXEEXT@ GNOMEHELP = @GNOMEHELP@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ ICONV = @ICONV@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LANGUAGES = @LANGUAGES@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ MOFILES = @MOFILES@ MSGCONV = @MSGCONV@ MSGFMT = @MSGFMT@ -OBJEXT = @OBJEXT@ 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@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ @@ -91,56 +89,29 @@ 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@ 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@ SUBDIRS = gramps subdir = example -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = DIST_SOURCES = -RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ - ps-recursive install-info-recursive uninstall-info-recursive \ - all-recursive install-data-recursive install-exec-recursive \ - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive -DIST_COMMON = $(srcdir)/Makefile.in Makefile.am +RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ + uninstall-info-recursive all-recursive install-data-recursive \ + install-exec-recursive installdirs-recursive install-recursive \ + uninstall-recursive check-recursive installcheck-recursive +DIST_COMMON = Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) all: all-recursive @@ -206,17 +177,10 @@ tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done ETAGS = etags ETAGSFLAGS = -CTAGS = ctags -CTAGSFLAGS = - tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -232,15 +196,9 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - if (etags --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - else \ - include_option=--include; \ - fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ fi; \ done; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -253,41 +211,20 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @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 \ @@ -345,7 +282,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -355,7 +292,7 @@ clean: clean-recursive clean-am: clean-generic mostlyclean-am distclean: distclean-recursive - -rm -f Makefile + distclean-am: clean-am distclean-generic distclean-tags dvi: dvi-recursive @@ -377,39 +314,31 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-recursive - -rm -f Makefile + maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-recursive mostlyclean-am: mostlyclean-generic -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - uninstall-am: uninstall-info-am uninstall-info: uninstall-info-recursive -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ - clean-generic clean-recursive ctags ctags-recursive distclean \ - distclean-generic distclean-recursive distclean-tags distdir \ - dvi dvi-am dvi-recursive info info-am info-recursive install \ - install-am install-data install-data-am install-data-recursive \ +.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ + clean-generic clean-recursive distclean distclean-generic \ + distclean-recursive distclean-tags distdir dvi dvi-am \ + dvi-recursive info info-am info-recursive install install-am \ + install-data install-data-am install-data-recursive \ install-exec install-exec-am install-exec-recursive \ install-info install-info-am install-info-recursive install-man \ install-recursive install-strip installcheck installcheck-am \ installdirs installdirs-am installdirs-recursive \ maintainer-clean maintainer-clean-generic \ maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \ - ps-recursive tags tags-recursive uninstall uninstall-am \ - uninstall-info-am uninstall-info-recursive uninstall-recursive + mostlyclean-recursive tags tags-recursive uninstall \ + uninstall-am uninstall-info-am uninstall-info-recursive \ + uninstall-recursive # 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. diff --git a/gramps2/example/gramps/Makefile.in b/gramps2/example/gramps/Makefile.in index d6b3a5317..84df31ec2 100644 --- a/gramps2/example/gramps/Makefile.in +++ b/gramps2/example/gramps/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7.8 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, @@ -13,21 +13,45 @@ # PARTICULAR PURPOSE. @SET_MAKE@ +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 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 = : @@ -35,54 +59,28 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +EXEEXT = @EXEEXT@ +OBJEXT = @OBJEXT@ +PATH_SEPARATOR = @PATH_SEPARATOR@ + pkgdatadir = ${datadir}/@PACKAGE@/example -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BINSH = @BINSH@ CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EXEEXT = @EXEEXT@ GNOMEHELP = @GNOMEHELP@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ ICONV = @ICONV@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LANGUAGES = @LANGUAGES@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ MOFILES = @MOFILES@ MSGCONV = @MSGCONV@ MSGFMT = @MSGFMT@ -OBJEXT = @OBJEXT@ 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@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ @@ -92,43 +90,18 @@ 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@ 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@ # This is the src/data/templates level Makefile pkgdata_DATA = \ @@ -142,13 +115,12 @@ pkgdata_DATA = \ EXTRA_DIST = ${pkgdata_DATA} subdir = example/gramps -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = DIST_SOURCES = DATA = $(pkgdata_DATA) -DIST_COMMON = $(srcdir)/Makefile.in Makefile.am +DIST_COMMON = Makefile.am Makefile.in all: all-am .SUFFIXES: @@ -179,22 +151,13 @@ uninstall-pkgdataDATA: tags: TAGS TAGS: -ctags: CTAGS -CTAGS: - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @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 \ @@ -220,6 +183,7 @@ all-am: Makefile $(DATA) installdirs: $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) + install: install-am install-exec: install-exec-am install-data: install-data-am @@ -239,7 +203,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -249,7 +213,7 @@ clean: clean-am clean-am: clean-generic mostlyclean-am distclean: distclean-am - -rm -f Makefile + distclean-am: clean-am distclean-generic dvi: dvi-am @@ -271,21 +235,13 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f Makefile + maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - uninstall-am: uninstall-info-am uninstall-pkgdataDATA .PHONY: all all-am check check-am clean clean-generic distclean \ @@ -294,8 +250,8 @@ uninstall-am: uninstall-info-am uninstall-pkgdataDATA install-exec-am install-info install-info-am install-man \ install-pkgdataDATA 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-pkgdataDATA + mostlyclean mostlyclean-generic uninstall uninstall-am \ + uninstall-info-am uninstall-pkgdataDATA # 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. diff --git a/gramps2/gramps-mdk.spec b/gramps2/gramps-mdk.spec index 02cf01b73..91007f4e2 100644 --- a/gramps2/gramps-mdk.spec +++ b/gramps2/gramps-mdk.spec @@ -1,5 +1,5 @@ -%define ver 0.99 -%define rel 1 +%define ver 1.1.0 +%define rel 0.CVS20040219 %define prefix /usr %define localstatedir /var/lib # Ensure that internal RPM macros for configure & makeinstall diff --git a/gramps2/gramps.spec b/gramps2/gramps.spec index f33621bfe..647fb5c5e 100644 --- a/gramps2/gramps.spec +++ b/gramps2/gramps.spec @@ -1,5 +1,5 @@ -%define ver 0.99 -%define rel 1 +%define ver 1.1.0 +%define rel 0.CVS20040219 %define prefix /usr %define localstatedir /var/lib # Ensure that internal RPM macros for configure & makeinstall diff --git a/gramps2/src/AddMedia.py b/gramps2/src/AddMedia.py index 76fe4d51e..fe3b51f74 100644 --- a/gramps2/src/AddMedia.py +++ b/gramps2/src/AddMedia.py @@ -118,7 +118,7 @@ class AddMediaObject: if description == "": description = os.path.basename(filename) - mobj = RelLib.Photo() + mobj = RelLib.MediaObject() mobj.set_description(description) mobj.set_mime_type(type) self.db.add_object(mobj) @@ -135,6 +135,7 @@ class AddMediaObject: if self.update: self.update() self.object = mobj + self.db.commit_media_object(self.object) def on_name_changed(self,obj): """ diff --git a/gramps2/src/BaseDoc.py b/gramps2/src/BaseDoc.py index 833b54e2e..b7f1537cb 100644 --- a/gramps2/src/BaseDoc.py +++ b/gramps2/src/BaseDoc.py @@ -1095,7 +1095,7 @@ class BaseDoc: self.table_styles = {} self.cell_styles = {} self.name = "" - self.photo_list = [] + self.media_list = [] self.print_req = 0 self.mode = TEXT_MODE @@ -1122,7 +1122,7 @@ class BaseDoc: """ self.owner = owner - def add_photo(self,name,align,w_cm,h_cm): + def add_media_object(self,name,align,w_cm,h_cm): """ Adds a photo of the specified width (in centimeters) diff --git a/gramps2/src/ChooseParents.py b/gramps2/src/ChooseParents.py index 00562e336..e1f43f63d 100644 --- a/gramps2/src/ChooseParents.py +++ b/gramps2/src/ChooseParents.py @@ -485,6 +485,12 @@ class ChooseParents: break else: self.person.add_parent_family_id(family.get_id(),mother_rel,father_rel) + self.db.commit_person(self.person) + self.db.commit_family(family) + if self.father: + self.db.commit_person(self.father) + if self.mother: + self.db.commit_person(self.mother) Utils.modified() diff --git a/gramps2/src/EditPerson.py b/gramps2/src/EditPerson.py index e8a3ad6a0..ea11352e8 100644 --- a/gramps2/src/EditPerson.py +++ b/gramps2/src/EditPerson.py @@ -231,7 +231,7 @@ class EditPerson: Utils.bold_label(self.inet_label) if self.plist: Utils.bold_label(self.addr_label) - if self.person.get_photo_list(): + if self.person.get_media_list(): Utils.bold_label(self.gallery_label) # event display @@ -1398,7 +1398,6 @@ class EditPerson: self.person.set_address_list(self.plist) self.person.set_birth_id(self.birth.get_id()) self.person.set_death_id(self.death.get_id()) - Utils.modified() def on_apply_person_clicked(self,obj): surname = unicode(self.surname_field.get_text()) @@ -1422,7 +1421,6 @@ class EditPerson: del m[self.person.get_id()] m[idval] = self.person self.person.set_id(idval) - Utils.modified() else: n = GrampsCfg.nameof(m[idval]) msg1 = _("GRAMPS ID value was not changed.") @@ -1460,27 +1458,20 @@ class EditPerson: if not name.are_equal(self.person.get_primary_name()): self.person.set_primary_name(name) - Utils.modified() if nick != self.person.get_nick_name(): self.person.set_nick_name(nick) - Utils.modified() self.pdmap.clear() for key in self.db.get_place_id_keys(): p = self.db.get_place_display(key) self.pdmap[p[0]] = key - if not self.orig_birth.are_equal(self.birth): - if self.orig_birth == None: - self.db.add_event(self.birth) - self.set_birth_id(self.birth_id) - else: - self.orig_birth.clone(self.death) - # commit change - - self.orig_birth.clone(self.birth) - Utils.modified() + if self.orig_birth == None: + self.db.add_event(self.birth) + self.person.set_birth_id(self.birth_id) + elif not self.orig_birth.are_equal(self.birth): + self.db.commit_event(self.birth) # Update each of the families child lists to reflect any # change in ordering due to the new birth date @@ -1497,15 +1488,11 @@ class EditPerson: self.death.set_date(unicode(self.ddate.get_text())) self.death.set_place_id(self.get_place(self.dplace,1)) - if not self.orig_death.are_equal(self.death): - if self.orig_death == None: - self.db.add_event(self.death) - self.set_death_id(self.death.get_id()) - else: - self.orig_death.clone(self.death) - # commit change - - Utils.modified() + if self.orig_death == None: + self.db.add_event(self.death) + self.person.set_death_id(self.death.get_id()) + elif not self.orig_death.are_equal(self.death): + self.db.commit_event(self.death) male = self.is_male.get_active() female = self.is_female.get_active() @@ -1520,7 +1507,6 @@ class EditPerson: else: temp_family.set_mother_id(None) temp_family.set_father_id(self.person) - Utils.modified() elif female and self.person.get_gender() != RelLib.Person.female: self.person.set_gender(RelLib.Person.female) for temp_family in self.person.get_family_id_list(): @@ -1530,7 +1516,6 @@ class EditPerson: else: temp_family.set_father_id(None) temp_family.set_mother_id(self.person) - Utils.modified() elif unknown and self.person.get_gender() != RelLib.Person.unknown: self.person.set_gender(RelLib.Person.unknown) for temp_family in self.person.get_family_id_list(): @@ -1546,7 +1531,6 @@ class EditPerson: else: temp_family.set_mother_id(None) temp_family.set_father_id(self.person) - Utils.modified() if error == 1: msg2 = _("Problem changing the gender") @@ -1560,42 +1544,36 @@ class EditPerson: if text != self.person.get_note(): self.person.set_note(text) - Utils.modified() format = self.preform.get_active() if format != self.person.get_note_format(): self.person.set_note_format(format) - Utils.modified() if self.complete.get_active() != self.person.get_complete(): self.person.set_complete(self.complete.get_active()) - Utils.modified() if self.lds_not_loaded == 0: self.check_lds() ord = RelLib.LdsOrd(self.person.get_lds_baptism()) if not self.lds_baptism.are_equal(ord): self.person.set_lds_baptism(self.lds_baptism) - Utils.modified() ord = RelLib.LdsOrd(self.person.get_lds_endowment()) if not self.lds_endowment.are_equal(ord): self.person.set_lds_endowment(self.lds_endowment) - Utils.modified() ord = RelLib.LdsOrd(self.person.get_lds_sealing()) if not self.lds_sealing.are_equal(ord): self.person.set_lds_sealing(self.lds_sealing) - Utils.modified() if self.lists_changed: self.person.set_source_reference_list(self.srcreflist) - Utils.modified() self.update_lists() if self.callback: self.callback(self) + self.db.commit_person(self.person) self.close(1) def get_place(self,field,makenew=0): @@ -1665,9 +1643,9 @@ class EditPerson: NoteEdit.NoteEditor(self.lds_sealing,self,self.window) def load_person_image(self): - photo_list = self.person.get_photo_list() - if photo_list: - ph = photo_list[0] + media_list = self.person.get_media_list() + if media_list: + ph = media_list[0] object = ph.get_reference() if self.load_obj != object.get_path(): if object.get_mime_type()[0:5] == "image": diff --git a/gramps2/src/EditPlace.py b/gramps2/src/EditPlace.py index 13cd05dc6..892d42218 100644 --- a/gramps2/src/EditPlace.py +++ b/gramps2/src/EditPlace.py @@ -163,7 +163,7 @@ class EditPlace: else: self.flowed.set_active(1) - if self.place.get_photo_list(): + if self.place.get_media_list(): Utils.bold_label(self.gallery_label) self.top_window.signal_autoconnect({ diff --git a/gramps2/src/EditSource.py b/gramps2/src/EditSource.py index caf3d4197..3810ea0dd 100644 --- a/gramps2/src/EditSource.py +++ b/gramps2/src/EditSource.py @@ -94,12 +94,12 @@ class EditSource: else: self.flowed.set_active(1) - if self.source.get_photo_list(): + if self.source.get_media_list(): Utils.bold_label(self.gallery_label) self.top_window.signal_autoconnect({ "on_switch_page" : self.on_switch_page, - "on_addphoto_clicked" : self.gallery.on_add_photo_clicked, + "on_addphoto_clicked" : self.gallery.on_add_media_object_clicked, "on_selectphoto_clicked" : self.gallery.on_select_photo_clicked, "on_deletephoto_clicked" : self.gallery.on_delete_photo_clicked, "on_editphoto_clicked" : self.gallery.on_edit_photo_clicked, diff --git a/gramps2/src/EventEdit.py b/gramps2/src/EventEdit.py index 1f5acffc7..f61859de7 100644 --- a/gramps2/src/EventEdit.py +++ b/gramps2/src/EventEdit.py @@ -348,6 +348,7 @@ class EventEditor: if self.event.get_privacy() != priv: self.event.set_privacy(priv) self.parent.lists_changed = 1 + self.db.commit_event(self.event) def on_switch_page(self,obj,a,page): buf = self.note_field.get_buffer() diff --git a/gramps2/src/FamilyView.py b/gramps2/src/FamilyView.py index b7f2706b9..383f9fa8a 100644 --- a/gramps2/src/FamilyView.py +++ b/gramps2/src/FamilyView.py @@ -809,16 +809,16 @@ class FamilyView: self.clear() return - bd = self.parent.db.find_event_from_id(self.person.get_birth_id()).get_date() - dd = self.parent.db.find_event_from_id(self.person.get_death_id()).get_date() + bd = self.parent.db.find_event_from_id(self.person.get_birth_id()) + dd = self.parent.db.find_event_from_id(self.person.get_death_id()) if bd and dd: n = "%s\n\t%s %s\n\t%s %s " % (GrampsCfg.nameof(self.person), - _BORN,bd,_DIED,dd) + _BORN,bd.get_date(),_DIED,dd.get_date()) elif bd: - n = "%s\n\t%s %s" % (GrampsCfg.nameof(self.person),_BORN,bd) + n = "%s\n\t%s %s" % (GrampsCfg.nameof(self.person),_BORN,bd.get_date()) elif dd: - n = "%s\n\t%s %s" % (GrampsCfg.nameof(self.person),_DIED,dd) + n = "%s\n\t%s %s" % (GrampsCfg.nameof(self.person),_DIED,dd.get_date()) else: n = GrampsCfg.nameof(self.person) @@ -896,7 +896,7 @@ class FamilyView: list = person.get_parent_family_id_list() for (f,mrel,frel) in list: - fam = self.parent.db.get_family_id(f) + fam = self.parent.db.find_family_from_id(f) father_id = fam.get_father_id() mother_id = fam.get_mother_id() f = self.parent.db.find_person_from_id(father_id) diff --git a/gramps2/src/GrampsParser.py b/gramps2/src/GrampsParser.py index 8651ae809..9c26c1f48 100644 --- a/gramps2/src/GrampsParser.py +++ b/gramps2/src/GrampsParser.py @@ -142,7 +142,7 @@ class GrampsParser: "note" : (self.start_note, self.stop_note), "p" : (None, self.stop_ptag), "parentin" : (self.start_parentin,None), - "people" : (self.start_people, None), + "people" : (self.start_people, self.stop_people), "person" : (self.start_person, self.stop_person), "img" : (self.start_photo, self.stop_photo), "objref" : (self.start_objref, self.stop_objref), @@ -199,9 +199,8 @@ class GrampsParser: self.db.set_researcher(self.owner) if self.tempDefault != None: id = self.tempDefault - if self.db.person_map.has_key(id) and self.db.get_default_person() == None: - person = self.db.person_map[id] - self.db.set_default_person(person) + if self.db.has_person_id(id) and self.db.get_default_person() == None: + self.db.set_default_person(id) for key in self.func_map.keys(): del self.func_map[key] @@ -291,6 +290,7 @@ class GrampsParser: def start_event(self,attrs): self.event = RelLib.Event() + self.db.add_event(self.event) self.event_type = const.save_event(attrs["type"]) if attrs.has_key("conf"): self.event.conf = int(attrs["conf"]) @@ -333,8 +333,7 @@ class GrampsParser: self.address.private = int(attrs["priv"]) def start_bmark(self,attrs): - person = self.db.find_person_from_id(attrs["ref"]) - self.db.bookmarks.append(person) + self.db.bookmarks.append(attrs["ref"]) def start_person(self,attrs): if self.callback != None and self.count % self.increment == 0: @@ -469,18 +468,18 @@ class GrampsParser: self.source = self.db.find_source_from_id(attrs["id"]) def start_objref(self,attrs): - self.objref = RelLib.ObjectRef() + self.objref = RelLib.MediaRef() self.objref.set_reference(self.db.find_object_from_id(attrs['ref'])) if attrs.has_key('priv'): self.objref.set_privacy(int(attrs['priv'])) if self.family: - self.family.add_photo(self.objref) + self.family.add_media_object(self.objref) elif self.source: - self.source.add_photo(self.objref) + self.source.add_media_object(self.objref) elif self.person: - self.person.add_photo(self.objref) + self.person.add_media_object(self.objref) elif self.placeobj: - self.placeobj.add_photo(self.objref) + self.placeobj.add_media_object(self.objref) def start_object(self,attrs): self.object = self.db.find_object_from_id(attrs['id']) @@ -495,15 +494,19 @@ class GrampsParser: self.object.set_path(src) self.object.set_local(0) + def stop_people(self,tag): + pass + def stop_object(self,tag): + self.db.commit_media_object(self.object) self.object = None def stop_objref(self,tag): self.objref = None def start_photo(self,attrs): - self.photo = RelLib.Photo() - self.pref = RelLib.ObjectRef() + self.photo = RelLib.MediaObject() + self.pref = RelLib.MediaRef() self.pref.set_reference(self.photo) for key in attrs.keys(): @@ -527,13 +530,13 @@ class GrampsParser: self.photo.set_mime_type(Utils.get_mime_type(self.photo.get_path())) self.db.add_object(self.photo) if self.family: - self.family.add_photo(self.pref) + self.family.add_media_object(self.pref) elif self.source: - self.source.add_photo(self.pref) + self.source.add_media_object(self.pref) elif self.person: - self.person.add_photo(self.pref) + self.person.add_media_object(self.pref) elif self.placeobj: - self.placeobj.add_photo(self.pref) + self.placeobj.add_media_object(self.pref) def start_daterange(self,attrs): if self.source_ref: @@ -643,16 +646,16 @@ class GrampsParser: if self.placeobj.get_title() == "": loc = self.placeobj.get_main_location() self.placeobj.set_title(build_place_title(loc)) - self.db.build_place_display(self.placeobj.get_id()) + self.db.commit_place(self.placeobj) self.placeobj = None def stop_family(self,tag): + self.db.commit_family(self.family) self.family = None def stop_event(self,tag): self.event.name = self.event_type - self.db.add_event(self.event) if self.family: self.family.add_event_id(self.event.get_id()) else: @@ -662,6 +665,7 @@ class GrampsParser: self.person.set_death_id(self.event.get_id()) else: self.person.add_event_id(self.event.get_id()) + self.db.commit_event(self.event) self.event = None def stop_name(self,tag): @@ -684,12 +688,11 @@ class GrampsParser: else: self.placeobj = RelLib.Place() self.placeobj.set_title(tag) - self.db.add_place(self.placeobj) - self.place_map[tag] = self.placeobj if self.ord: - self.ord.set_place_id(self.placeobj) + self.ord.set_place_id(self.placeobj.get_id()) else: - self.event.place = self.placeobj.get_id() + self.event.set_place_id(self.placeobj.get_id()) + self.db.commit_place(self.placeobj) self.placeobj = None def stop_date(self,tag): @@ -707,6 +710,7 @@ class GrampsParser: def stop_person(self,tag): self.db.build_person_display(self.person.get_id()) + self.db.commit_person(self.person) self.person = None def stop_description(self,tag): @@ -731,7 +735,7 @@ class GrampsParser: self.source_ref = None def stop_source(self,tag): - self.db.build_source_display(self.source.get_id()) + self.db.commit_source(self.source) self.source = None def stop_sauthor(self,tag): @@ -1028,18 +1032,18 @@ class GrampsImportParser(GrampsParser): self.count = self.count + 1 def start_objref(self,attrs): - self.objref = RelLib.ObjectRef() + self.objref = RelLib.MediaRef() self.objref.set_reference(self.db.find_object_no_conflicts(attrs['ref'],self.MediaFileMap)) if attrs.has_key('priv'): self.objref.set_privacy(int(attrs['priv'])) if self.family: - self.family.add_photo(self.objref) + self.family.add_media_object(self.objref) elif self.source: - self.source.add_photo(self.objref) + self.source.add_media_object(self.objref) elif self.person: - self.person.add_photo(self.objref) + self.person.add_media_object(self.objref) elif self.placeobj: - self.placeobj.add_photo(self.objref) + self.placeobj.add_media_object(self.objref) def start_object(self,attrs): self.object = self.db.find_object_no_conflicts(attrs['id'],self.MediaFileMap) diff --git a/gramps2/src/GrampsXML.py b/gramps2/src/GrampsXML.py index 999acd8cd..7b4cb739d 100644 --- a/gramps2/src/GrampsXML.py +++ b/gramps2/src/GrampsXML.py @@ -39,18 +39,10 @@ class GrampsXML(RelLib.GrampsDB): def load(self,name,callback): ReadXML.loadData(self,name,callback) - for key in self.person_map.keys(): - person = self.person_map[key] - self.add_surname(person.get_primary_name().get_surname()) +# for key in self.person_map.keys(): +# data = self.person_map[key] +# name = data[2] +# print key,data +# self.add_surname(name.get_surname()) - self.placeTable = {} - for key in self.place_map.keys(): - place = self.place_map[key] - self.place_table[key] = place.get_display_info() - - self.sourceTable = {} - for key in self.source_map.keys(): - src = self.source_map[key] - self.source_table[key] = src.get_display_info() - return 1 diff --git a/gramps2/src/ImageSelect.py b/gramps2/src/ImageSelect.py index 8f845454b..267ceeae2 100644 --- a/gramps2/src/ImageSelect.py +++ b/gramps2/src/ImageSelect.py @@ -176,13 +176,13 @@ class ImageSelect: break if (already_imported): - oref = RelLib.ObjectRef() + oref = RelLib.MediaRef() oref.set_reference(already_imported) - self.dataobj.add_photo(oref) + self.dataobj.add_media_object(oref) self.add_thumbnail(oref) else: type = Utils.get_mime_type(filename) - mobj = RelLib.Photo() + mobj = RelLib.MediaObject() if description == "": description = os.path.basename(filename) mobj.set_description(description) @@ -247,7 +247,7 @@ class Gallery(ImageSelect): self.dataobj = dataobj; self.iconlist = icon_list; self.root = self.iconlist.root() - self.old_photo_list = self.dataobj.get_photo_list()[:] + self.old_media_list = self.dataobj.get_media_list()[:] # Local object variables self.y = 0 @@ -269,8 +269,8 @@ class Gallery(ImageSelect): # restore old photo list, in case we removed some and then # hit cancel button or closed the window if not ok: - if self.old_photo_list is not None: - self.dataobj.set_photo_list(self.old_photo_list) + if self.old_media_list is not None: + self.dataobj.set_media_list(self.old_media_list) def on_canvas1_event(self,obj,event): """ @@ -295,7 +295,7 @@ class Gallery(ImageSelect): self.drag_item = widget.get_item_at(self.remember_x, self.remember_y) icon_index = self.get_index(widget,event.x,event.y)-1 - self.sel_obj = self.dataobj.get_photo_list()[icon_index] + self.sel_obj = self.dataobj.get_media_list()[icon_index] if self.drag_item: widget.drag_begin(_drag_targets, gtk.gdk.ACTION_COPY|gtk.gdk.ACTION_MOVE, @@ -365,9 +365,9 @@ class Gallery(ImageSelect): def savephoto(self, photo): """Save the photo in the dataobj object. (Required function)""" self.db.add_object(photo) - oref = RelLib.ObjectRef() + oref = RelLib.MediaRef() oref.set_reference(photo) - self.dataobj.add_photo(oref) + self.dataobj.add_media_object(oref) def add_thumbnail(self, photo): """Scale the image and add it to the IconList.""" @@ -448,7 +448,7 @@ class Gallery(ImageSelect): self.max = (self.x)/(_IMAGEX+_PAD) - for photo in self.dataobj.get_photo_list(): + for photo in self.dataobj.get_media_list(): self.add_thumbnail(photo) if self.cy > self.y: @@ -456,7 +456,7 @@ class Gallery(ImageSelect): else: self.iconlist.set_scroll_region(0,0,self.x,self.y) - if self.dataobj.get_photo_list(): + if self.dataobj.get_media_list(): Utils.bold_label(self.parent.gallery_label) else: Utils.unbold_label(self.parent.gallery_label) @@ -465,7 +465,7 @@ class Gallery(ImageSelect): x_offset = x/(_IMAGEX+_PAD) y_offset = y/(_IMAGEY+_PAD) index = (y_offset*(1+self.max))+x_offset - return min(index,len(self.dataobj.get_photo_list())) + return min(index,len(self.dataobj.get_media_list())) def on_photolist_drag_data_received(self,w, context, x, y, data, info, time): if data and data.format == 8: @@ -475,7 +475,7 @@ class Gallery(ImageSelect): if protocol == "file": name = file mime = Utils.get_mime_type(name) - photo = RelLib.Photo() + photo = RelLib.MediaObject() photo.set_path(name) photo.set_mime_type(mime) basename = os.path.basename(name) @@ -500,15 +500,15 @@ class Gallery(ImageSelect): ErrorDialog(t,str(msg)) return mime = Utils.get_mime_type(tfile) - photo = RelLib.Photo() + photo = RelLib.MediaObject() photo.set_mime_type(mime) photo.set_description(d) photo.setLocal(1) photo.set_path(tfile) self.db.add_object(photo) - oref = RelLib.ObjectRef() + oref = RelLib.MediaRef() oref.set_reference(photo) - self.dataobj.add_photo(oref) + self.dataobj.add_media_object(oref) try: id = photo.get_id() name = RelImage.import_media_object(tfile,self.path,id) @@ -526,12 +526,12 @@ class Gallery(ImageSelect): if self.db.get_object_map().has_key(data.data): icon_index = self.get_index(w,x,y) index = 0 - for p in self.dataobj.get_photo_list(): + for p in self.dataobj.get_media_list(): if data.data == p.get_reference().get_id(): if index == icon_index or icon_index == -1: return else: - nl = self.dataobj.get_photo_list() + nl = self.dataobj.get_media_list() item = nl[index] if icon_index == 0: del nl[index] @@ -539,15 +539,15 @@ class Gallery(ImageSelect): else: del nl[index] nl = nl[0:icon_index] + [item] + nl[icon_index:] - self.dataobj.set_photo_list(nl) + self.dataobj.set_media_list(nl) Utils.modified() self.parent.lists_changed = 1 self.load_images() return index = index + 1 - oref = RelLib.ObjectRef() + oref = RelLib.MediaRef() oref.set_reference(self.db.find_object_from_id(data.data)) - self.dataobj.add_photo(oref) + self.dataobj.add_media_object(oref) self.add_thumbnail(oref) self.parent.lists_changed = 1 if GrampsCfg.globalprop: @@ -561,7 +561,7 @@ class Gallery(ImageSelect): selection_data.set(selection_data.target, 8, id[4]) self.drag_item = None - def on_add_photo_clicked(self, obj): + def on_add_media_object_clicked(self, obj): """User wants to add a new photo. Create a dialog to find out which photo they want.""" self.create_add_dialog() @@ -574,9 +574,9 @@ class Gallery(ImageSelect): object = s_o.run() if not object: return - oref = RelLib.ObjectRef() + oref = RelLib.MediaRef() oref.set_reference(object) - self.dataobj.add_photo(oref) + self.dataobj.add_media_object(oref) self.add_thumbnail(oref) self.parent.lists_changed = 1 @@ -593,9 +593,9 @@ class Gallery(ImageSelect): val[1].hide() val[2].hide() - l = self.dataobj.get_photo_list() + l = self.dataobj.get_media_list() l.remove(photo) - self.dataobj.set_photo_list(l) + self.dataobj.set_media_list(l) self.parent.lists_changed = 1 self.load_images() @@ -817,6 +817,7 @@ class LocalMediaProperties: self.photo.set_attribute_list(self.alist) self.parent.lists_changed = 1 Utils.modified() + self.db.commit_media_object(self.object) def on_help_clicked(self, obj): """Display the relevant portion of GRAMPS manual""" @@ -1002,24 +1003,24 @@ class GlobalMediaProperties: any = 0 for key in self.db.get_person_keys(): p = self.db.get_person(key) - for o in p.get_photo_list(): + for o in p.get_media_list(): if o.get_reference() == self.object: self.refmodel.add([_("Person"),p.get_id(),GrampsCfg.nameof(p)]) any = 1 for p in self.db.get_family_id_map().values(): - for o in p.get_photo_list(): + for o in p.get_media_list(): if o.get_reference() == self.object: self.refmodel.add([_("Family"),p.get_id(),Utils.family_name(p)]) any = 1 for key in self.db.get_source_keys(): p = self.db.get_source(key) - for o in p.get_photo_list(): + for o in p.get_media_list(): if o.get_reference() == self.object: self.refmodel.add([_("Source"),p.get_id(),p.get_title()]) any = 1 for key in self.db.get_place_id_keys(): p = self.db.get_place_id(key) - for o in p.get_photo_list(): + for o in p.get_media_list(): if o.get_reference() == self.object: self.refmodel.add([_("Place"),p.get_id(),p.get_title()]) any = 1 @@ -1056,6 +1057,7 @@ class GlobalMediaProperties: Utils.modified() if self.update != None: self.update() + self.db.commit_media_object(self.object) def on_help_clicked(self, obj): """Display the relevant portion of GRAMPS manual""" @@ -1116,48 +1118,48 @@ class DeleteMediaQuery: p = self.db.get_person(key) nl = [] change = 0 - for photo in p.get_photo_list(): + for photo in p.get_media_list(): if photo.get_reference() != self.media: nl.append(photo) else: change = 1 if change: - p.set_photo_list(nl) + p.set_media_list(nl) for p in self.db.get_family_id_map().values(): nl = [] change = 0 - for photo in p.get_photo_list(): + for photo in p.get_media_list(): if photo.get_reference() != self.media: nl.append(photo) else: change = 1 if change: - p.set_photo_list(nl) + p.set_media_list(nl) for key in self.db.get_source_keys(): p = self.db.get_source(key) nl = [] change = 0 - for photo in p.get_photo_list(): + for photo in p.get_media_list(): if photo.get_reference() != self.media: nl.append(photo) else: change = 1 if change: - p.set_photo_list(nl) + p.set_media_list(nl) for key in self.db.get_place_id_keys(): p = self.db.get_place_id(key) nl = [] change = 0 - for photo in p.get_photo_list(): + for photo in p.get_media_list(): if photo.get_reference() != self.media: nl.append(photo) else: change = 1 if change: - p.set_photo_list(nl) + p.set_media_list(nl) if self.update: self.update(0) diff --git a/gramps2/src/Makefile.in b/gramps2/src/Makefile.in index d7abca001..b63ff8591 100644 --- a/gramps2/src/Makefile.in +++ b/gramps2/src/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7.8 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, @@ -13,77 +13,73 @@ # PARTICULAR PURPOSE. @SET_MAKE@ +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@ - -# For intl. support, how do we compile? -CFLAGS = -fPIC -shared -O @GNOMEINC@ @CFLAGS@ @CPPFLAGS@ -I@includedir@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EXEEXT = @EXEEXT@ GNOMEHELP = @GNOMEHELP@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ ICONV = @ICONV@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LANGUAGES = @LANGUAGES@ -LDFLAGS = @GNOMELIB@ @LDFLAGS@ -L@libdir@ @LIBS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ MOFILES = @MOFILES@ MSGCONV = @MSGCONV@ MSGFMT = @MSGFMT@ -OBJEXT = @OBJEXT@ 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@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ @@ -93,46 +89,25 @@ 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@ 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@ # This is the src level Makefile for Gramps SUBDIRS = docgen filters plugins data po calendars + +# For intl. support, how do we compile? +CFLAGS = -fPIC -shared -O @GNOMEINC@ @CFLAGS@ @CPPFLAGS@ -I@includedir@ +LDFLAGS = @GNOMELIB@ @LDFLAGS@ -L@libdir@ @LIBS@ CLEANFILES = grampslib.so MOSTLYCLEANFILES = @@ -269,7 +244,6 @@ dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) gramps.desktop papersize.xml EXTRA_DIST = grampslib.i grampslib_wrap.c subdir = src -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = const.py DIST_SOURCES = @@ -277,13 +251,12 @@ py_compile = $(top_srcdir)/py-compile DATA = $(dist_pkgdata_DATA) -RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ - ps-recursive install-info-recursive uninstall-info-recursive \ - all-recursive install-data-recursive install-exec-recursive \ - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive -DIST_COMMON = $(dist_pkgdata_DATA) $(pkgpython_PYTHON) \ - $(srcdir)/Makefile.in Makefile.am const.py.in +RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ + uninstall-info-recursive all-recursive install-data-recursive \ + install-exec-recursive installdirs-recursive install-recursive \ + uninstall-recursive check-recursive installcheck-recursive +DIST_COMMON = $(dist_pkgdata_DATA) $(pkgpython_PYTHON) Makefile.am \ + Makefile.in const.py.in DIST_SUBDIRS = $(SUBDIRS) all: all-recursive @@ -301,12 +274,11 @@ install-pkgpythonPYTHON: $(pkgpython_PYTHON) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(pkgpythondir) @list='$(pkgpython_PYTHON)'; dlist=''; for p in $$list; do\ - if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \ - if test -f $$b$$p; then \ + if test -f $(srcdir)/$$p; then \ d=`echo "$$p" | sed -e 's,^.*/,,'`; \ dlist="$$dlist $$d"; \ - echo " $(pkgpythonPYTHON_INSTALL) $$b$$p $(DESTDIR)$(pkgpythondir)/$$d"; \ - $(pkgpythonPYTHON_INSTALL) $$b$$p $(DESTDIR)$(pkgpythondir)/$$d; \ + echo " $(pkgpythonPYTHON_INSTALL) $(srcdir)/$$p $(DESTDIR)$(pkgpythondir)/$$d"; \ + $(pkgpythonPYTHON_INSTALL) $(srcdir)/$$p $(DESTDIR)$(pkgpythondir)/$$d; \ else :; fi; \ done; \ PYTHON=$(PYTHON) $(py_compile) --basedir $(DESTDIR)$(pkgpythondir) $$dlist @@ -392,17 +364,10 @@ tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done ETAGS = etags ETAGSFLAGS = -CTAGS = ctags -CTAGSFLAGS = - tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -418,15 +383,9 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - if (etags --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - else \ - include_option=--include; \ - fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ fi; \ done; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -439,41 +398,20 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @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 \ @@ -534,7 +472,7 @@ clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -544,7 +482,7 @@ clean: clean-recursive clean-am: clean-generic mostlyclean-am distclean: distclean-recursive - -rm -f Makefile + distclean-am: clean-am distclean-generic distclean-tags dvi: dvi-recursive @@ -567,42 +505,32 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-recursive - -rm -f Makefile + maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-recursive mostlyclean-am: mostlyclean-generic -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - uninstall-am: uninstall-dist_pkgdataDATA uninstall-info-am \ uninstall-local uninstall-pkgpythonPYTHON uninstall-info: uninstall-info-recursive -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local check \ - check-am clean clean-generic clean-recursive ctags \ - ctags-recursive distclean distclean-generic distclean-recursive \ - distclean-tags distdir dvi dvi-am dvi-recursive info info-am \ - info-recursive install install-am install-data install-data-am \ - install-data-local install-data-recursive \ - install-dist_pkgdataDATA install-exec install-exec-am \ - install-exec-recursive install-info install-info-am \ - install-info-recursive install-man install-pkgpythonPYTHON \ - install-recursive install-strip installcheck installcheck-am \ - installdirs installdirs-am installdirs-recursive \ - maintainer-clean maintainer-clean-generic \ +.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am all-local check check-am \ + clean clean-generic clean-recursive distclean distclean-generic \ + distclean-recursive distclean-tags distdir dvi dvi-am \ + dvi-recursive info info-am info-recursive install install-am \ + install-data install-data-am install-data-local \ + install-data-recursive install-dist_pkgdataDATA install-exec \ + install-exec-am install-exec-recursive install-info \ + install-info-am install-info-recursive install-man \ + install-pkgpythonPYTHON install-recursive install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + installdirs-recursive maintainer-clean maintainer-clean-generic \ maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \ - ps-recursive tags tags-recursive uninstall uninstall-am \ - uninstall-dist_pkgdataDATA uninstall-info-am \ + mostlyclean-recursive tags tags-recursive uninstall \ + uninstall-am uninstall-dist_pkgdataDATA uninstall-info-am \ uninstall-info-recursive uninstall-local \ uninstall-pkgpythonPYTHON uninstall-recursive diff --git a/gramps2/src/Marriage.py b/gramps2/src/Marriage.py index eeb71407c..d9c1526e4 100644 --- a/gramps2/src/Marriage.py +++ b/gramps2/src/Marriage.py @@ -106,7 +106,7 @@ class Marriage: "on_attr_down_clicked" : self.on_attr_down_clicked, "on_add_attr_clicked" : self.on_add_attr_clicked, "on_delete_attr_clicked" : self.on_delete_attr_clicked, - "on_addphoto_clicked" : self.gallery.on_add_photo_clicked, + "on_addphoto_clicked" : self.gallery.on_add_media_object_clicked, "on_selectphoto_clicked" : self.gallery.on_select_photo_clicked, "on_close_marriage_editor" : self.on_close_marriage_editor, "on_delete_event" : self.on_delete_event, @@ -600,6 +600,7 @@ class Marriage: if self.lists_changed: Utils.modified() self.update_fv(self.family) + self.db.commit_family(self.family) def event_edit_callback(self,event): """Birth and death events may not be in the map""" diff --git a/gramps2/src/MediaView.py b/gramps2/src/MediaView.py index 2f48ba3cb..95a788f5e 100644 --- a/gramps2/src/MediaView.py +++ b/gramps2/src/MediaView.py @@ -250,9 +250,10 @@ class MediaView: self.model.clear() self.id2col = {} - objects = self.db.get_object_map().values() + object_keys = self.db.get_object_keys() - for src in objects: + for src_key in object_keys: + src = self.db.get_object(src_key) title = src.get_description() id = src.get_id() type = Utils.get_mime_description(src.get_mime_type()) @@ -305,22 +306,22 @@ class MediaView: def is_object_used(self,mobj): for p in self.db.get_family_id_map().values(): - for o in p.get_photo_list(): + for o in p.get_media_list(): if o.get_reference() == mobj: return 1 for key in self.db.get_person_keys(): p = self.db.get_person(key) - for o in p.get_photo_list(): + for o in p.get_media_list(): if o.get_reference() == mobj: return 1 for key in self.db.get_source_keys(): p = self.db.get_source(key) - for o in p.get_photo_list(): + for o in p.get_media_list(): if o.get_reference() == mobj: return 1 for key in self.db.get_place_id_keys(): p = self.db.get_place_id(key) - for o in p.get_photo_list(): + for o in p.get_media_list(): if o.get_reference() == mobj: return 1 return 0 @@ -354,7 +355,7 @@ class MediaView: if protocol == "file": name = file mime = Utils.get_mime_type(name) - photo = RelLib.Photo() + photo = RelLib.MediaObject() photo.set_path(name) photo.set_mime_type(mime) description = os.path.basename(name) @@ -369,7 +370,7 @@ class MediaView: if name: photo.set_path(name) photo.setLocal(1) - Utils.modified() + self.db.commit_media_object(photo) if GrampsCfg.globalprop: ImageSelect.GlobalMediaProperties(self.db,photo,self.load_media) elif protocol != "": @@ -381,13 +382,13 @@ class MediaView: ErrorDialog(_('Image import failed'),str(msg)) return mime = Utils.get_mime_type(tfile) - photo = RelLib.Photo() + photo = RelLib.MediaObject() photo.set_mime_type(mime) photo.set_description(d) photo.setLocal(1) photo.set_path(tfile) self.db.add_object(photo) - oref = RelLib.ObjectRef() + oref = RelLib.MediaRef() oref.set_reference(photo) try: id = photo.get_id() @@ -400,6 +401,7 @@ class MediaView: photo.set_path(tfile) return Utils.modified() + self.db.commit_media_object(photo) if GrampsCfg.globalprop: ImageSelect.GlobalMediaProperties(self.db,photo,None) diff --git a/gramps2/src/MergeData.py b/gramps2/src/MergeData.py index dc12f6cbe..033403f28 100644 --- a/gramps2/src/MergeData.py +++ b/gramps2/src/MergeData.py @@ -333,8 +333,8 @@ class MergePeople: self.merge_families() - for photo in self.p2.get_photo_list(): - self.p1.add_photo(photo) + for photo in self.p2.get_media_list(): + self.p1.add_media_object(photo) if self.p1.get_nick_name() == "": self.p1.set_nick_name(self.p2.get_nick_name()) @@ -858,8 +858,8 @@ class MergePlaces: self.p1.add_url(url) # Copy photos from P2 to P1 - for photo in self.p2.get_photo_list(): - self.p1.add_photo(photo) + for photo in self.p2.get_media_list(): + self.p1.add_media_object(photo) # Copy sources from P2 to P1 for source in self.p2.get_source_references(): diff --git a/gramps2/src/PedView.py b/gramps2/src/PedView.py index 141b79917..6cf0d607d 100644 --- a/gramps2/src/PedView.py +++ b/gramps2/src/PedView.py @@ -37,7 +37,6 @@ import pango #------------------------------------------------------------------------- import GrampsCfg from gettext import gettext as _ -#from Relationship import apply_filter _PAD = 3 _CANVASPAD = 3 @@ -47,7 +46,7 @@ _DIED = _('d.') class DispBox: - def __init__(self,root,style,x,y,w,h,person,change): + def __init__(self,root,style,x,y,w,h,person,db,change): shadow = _PAD xpad = _PAD @@ -60,8 +59,18 @@ class DispBox: self.root = root self.name = GrampsCfg.nameof(person) - bd = person.get_birth().get_date() - dd = person.get_death().get_date() + birth_id = self.person.get_birth_id() + death_id = self.person.get_death_id() + if birth_id: + bd = db.find_event_from_id(birth_id).get_date() + else: + bd = "" + + if death_id: + dd = db.find_event_from_id(death_id).get_date() + else: + dd = "" + if bd and dd: self.exp = "%s\n%s %s\n%s %s" % (self.name,_BORN,bd,_DIED,dd ) elif bd: @@ -195,9 +204,19 @@ class PedigreeView: for t in list: if t: - for n in [GrampsCfg.nameof(t[0]), - u'%s %s' % (_BORN,t[0].get_birth().get_date()), - u'%s %s' % (_DIED,t[0].get_death().get_date())]: + birth_id = t[0].get_birth_id() + death_id = t[0].get_death_id() + if birth_id: + birth = self.parent.db.find_event_from_id(birth_id).get_date() + else: + birth = u"" + if death_id: + death = self.parent.db.find_event_from_id(death_id).get_date() + else: + death = u"" + + for n in [GrampsCfg.nameof(t[0]), u'%s %s' % (_BORN,birth), + u'%s %s' % (_DIED,death)]: try: a.set_text(n,len(n)) except TypeError: @@ -285,7 +304,7 @@ class PedigreeView: self.draw_canvas_line(xpts[i],ypts[i], xpts[mindex], ypts[mindex], h, w, p[0], style, p[1]) p = list[i] - box = DispBox(self.root,style,xpts[i],ypts[i],w,h,p[0], + box = DispBox(self.root,style,xpts[i],ypts[i],w,h,p[0],self.parent.db, self.change_active_person) self.boxes.append(box) self.change_active_person(person) diff --git a/gramps2/src/PeopleView.py b/gramps2/src/PeopleView.py index 6065ca7f8..77cfd6039 100644 --- a/gramps2/src/PeopleView.py +++ b/gramps2/src/PeopleView.py @@ -87,8 +87,7 @@ class PeopleView: to get the IDs of the selected objects. Set the active person to the first person in the list. If no one is selected, set the active person to None""" selected_id_list = self.person_tree.get_selected_objects() - if selected_id_list: - assert(selected_id_list[0]) + if selected_id_list and selected_id_list[0]: try: self.parent.change_active_person(self.parent.db.get_person(selected_id_list[0])) except: @@ -217,7 +216,7 @@ class PeopleView: ddate = self.parent.db.find_event_from_id(val[4]).get_date() else: ddate = "" - + iter = model.add([val[0],val[1],val[2],bdate,ddate,val[5], val[6],val[7],val[8]],1) @@ -243,10 +242,10 @@ class PeopleView: return id = self.parent.active_person.get_id() - val = self.parent.db.get_person_display(id) if self.id2col.has_key(id): (model,iter) = self.id2col[id] else: + val = self.parent.db.get_person_display(id) pg = val[5] if pg and pg != '@': pg = pg[0] @@ -278,7 +277,7 @@ class PeopleView: model.selection.select_iter(iter) except: print iter - + itpath = model.model.get_path(iter) col = model.tree.get_column(0) model.tree.scroll_to_cell(itpath,col,1,0.5,0) @@ -314,12 +313,20 @@ class PeopleView: if current_model == model: if val[3]: - bdate = self.parent.db.find_event_from_id(val[3]).get_date() + bdate_obj = self.parent.db.find_event_from_id(val[3]) + if bdate_obj: + bdate = bdate_obj.get_date() + else: + bdate = "" else: bdate = "" if val[4]: - ddate = self.parent.db.find_event_from_id(val[4]).get_date() + ddate_obj = self.parent.db.find_event_from_id(val[4]) + if ddate_obj: + ddate = ddate_obj.get_date() + else: + ddate = "" else: ddate = "" iter = model.add([val[0],val[1],val[2],bdate,ddate,val[5], diff --git a/gramps2/src/ReadXML.py b/gramps2/src/ReadXML.py index 68727b4a0..9bb138932 100644 --- a/gramps2/src/ReadXML.py +++ b/gramps2/src/ReadXML.py @@ -146,32 +146,32 @@ def importData(database, filename, callback,cl=0): # File is lost => remove all references and the object itself mobj = ObjectMap[NewMediaID] for p in database.get_family_id_map().values(): - nl = p.get_photo_list() + nl = p.get_media_list() for o in nl: if o.get_reference() == mobj: nl.remove(o) - p.set_photo_list(nl) + p.set_media_list(nl) for key in database.get_person_keys(): p = database.get_person(key) - nl = p.get_photo_list() + nl = p.get_media_list() for o in nl: if o.get_reference() == mobj: nl.remove(o) - p.set_photo_list(nl) + p.set_media_list(nl) for key in database.get_source_keys(): p = database.get_source(key) - nl = p.get_photo_list() + nl = p.get_media_list() for o in nl: if o.get_reference() == mobj: nl.remove(o) - p.set_photo_list(nl) + p.set_media_list(nl) for key in database.get_place_id_keys(): p = database.get_place_id(key) - nl = p.get_photo_list() + nl = p.get_media_list() for o in nl: if o.get_reference() == mobj: nl.remove(o) - p.set_photo_list(nl) + p.set_media_list(nl) database.remove_object(NewMediaID) @@ -294,11 +294,11 @@ def loadData(database, filename, callback=None): import traceback traceback.print_exc() return 0 - except: - ErrorDialog(_("Error reading %s") % filename) - import traceback - traceback.print_exc() - return 0 +# except: +# ErrorDialog(_("Error reading %s") % filename) +# import traceback +# traceback.print_exc() +# return 0 xml_file.close() del parser diff --git a/gramps2/src/RelLib.py b/gramps2/src/RelLib.py index bdf7ff93d..fba3ba9f2 100644 --- a/gramps2/src/RelLib.py +++ b/gramps2/src/RelLib.py @@ -289,9 +289,9 @@ class Place(SourceNote): self.urls = [] for u in source.urls: self.urls.append(Url(u)) - self.photo_list = [] - for photo in source.photo_list: - self.photo_list.append(ObjectRef(photo)) + self.media_list = [] + for photo in source.media_list: + self.media_list.append(MediaRef(photo)) else: self.long = "" self.lat = "" @@ -300,7 +300,15 @@ class Place(SourceNote): self.alt_loc = [] self.id = "" self.urls = [] - self.photo_list = [] + self.media_list = [] + + def serialize(self): + return (self.id, self.title, self.long, self.lat, self.main_loc, + self.alt_loc, self.urls, self.media_list, self.source_list, self.note) + + def unserialize(self,data): + (self.id, self.title, self.long, self.lat, self.main_loc, + self.alt_loc, self.urls, self.media_list, self.source_list, self.note) = data def get_url_list(self): """Return the list of URLs""" @@ -369,17 +377,17 @@ class Place(SourceNote): if loc not in self.alt_loc: self.alt_loc.append(loc) - def add_photo(self,photo): + def add_media_object(self,photo): """Adds a Photo object to the place object's image list""" - self.photo_list.append(photo) + self.media_list.append(photo) - def get_photo_list(self): + def get_media_list(self): """Returns the list of Photo objects""" - return self.photo_list + return self.media_list - def set_photo_list(self,list): + def set_media_list(self,list): """Sets the list of Photo objects""" - self.photo_list = list + self.media_list = list def get_display_info(self): """Gets the display information associated with the object. This includes @@ -575,12 +583,12 @@ class Note: """return the note's format""" return self.format -class Photo(SourceNote): +class MediaObject(SourceNote): """Containter for information about an image file, including location, description and privacy""" def __init__(self,source=None): - """Create a new Photo object, copying from the source if provided""" + """Create a new MediaObject object, copying from the source if provided""" SourceNote.__init__(self,source) @@ -600,6 +608,14 @@ class Photo(SourceNote): self.mime = "" self.desc = "" + def serialize(self): + return (self.id, self.local, self.path, self.mime, self.desc, self.attrlist, + self.source_list, self.note) + + def unserialize(self,data): + (self.id, self.local, self.path, self.mime, self.desc, self.attrlist, + self.source_list, self.note) = data + def set_local(self,val): """set or clear the local flag""" self.local = val @@ -639,7 +655,7 @@ class Photo(SourceNote): return self.desc def add_attribute(self,attr): - """Adds a propery to the Photo object. This is not used by gramps, + """Adds a propery to the MediaObject object. This is not used by gramps, but provides a means for XML users to attach other properties to the image""" self.attrlist.append(attr) @@ -652,7 +668,7 @@ class Photo(SourceNote): self.attrlist = list -class ObjectRef: +class MediaRef: """Object reference class""" def __init__(self,source=None): self.attrlist = [] @@ -719,7 +735,7 @@ class ObjectRef: self.note = Note(self.note.get()) def add_attribute(self,attr): - """Adds a propery to the Photo object. This is not used by gramps, + """Adds a propery to the MediaObject object. This is not used by gramps, but provides a means for XML users to attach other properties to the image""" self.attrlist.append(attr) @@ -1095,11 +1111,11 @@ class Person(SourceNote): """creates a new Person instance""" SourceNote.__init__(self) self.id = id - self.primary_name = None + self.primary_name = Name() self.event_list = [] self.family_list = [] self.parent_family_list = [] - self.photo_list = [] + self.media_list = [] self.nickname = "" self.alternate_names = [] self.gender = 2 @@ -1118,18 +1134,32 @@ class Person(SourceNote): # its genderStats. It doesn't get set here, but from # GenderStats.count_person. self.db = None - + def serialize(self): return (self.id, self.gender, self.primary_name, self.alternate_names, self.nickname, self.death_id, self.birth_id, self.event_list, self.family_list, self.parent_family_list, - self.photo_list, + self.media_list, self.address_list, self.attribute_list, self.urls, self.lds_bapt, self.lds_endow, self.lds_seal, - self.complete) + self.complete, + self.source_list, + self.note) + + def unserialize(self,data): + (self.id, self.gender, + self.primary_name, self.alternate_names, self.nickname, + self.death_id, self.birth_id, self.event_list, + self.family_list, self.parent_family_list, + self.media_list, + self.address_list, + self.attribute_list, + self.urls, + self.lds_bapt, self.lds_endow, self.lds_seal, + self.complete, self.source_list, self.note) = data def set_complete(self,val): self.complete = val @@ -1266,17 +1296,17 @@ class Person(SourceNote): # else: # return e - def add_photo(self,photo): - """adds a Photo instance to the image list""" - self.photo_list.append(photo) + def add_media_object(self,photo): + """adds a MediaObject instance to the image list""" + self.media_list.append(photo) - def get_photo_list(self): - """returns the list of Photos""" - return self.photo_list + def get_media_list(self): + """returns the list of MediaObjects""" + return self.media_list - def set_photo_list(self,list): - """Sets the list of Photo objects""" - self.photo_list = list + def set_media_list(self,list): + """Sets the list of MediaObject objects""" + self.media_list = list def add_event_id(self,event_id): """adds an Event to the event list""" @@ -1584,6 +1614,9 @@ class Event(DataObj): self.name = source.name self.cause = source.cause self.id = source.id + self.private = source.private + self.source_list = source.source_list[:] + self.note = source.note try: if source.witness: self.witness = source.witness[:] @@ -1592,6 +1625,16 @@ class Event(DataObj): except: self.witness = None + def serialize(self): + return (self.id, self.name, self.date, self.description, + self.place, self.cause, self.private, self.source_list, + self.note, self.witness) + + def unserialize(self,data): + (self.id, self.name, self.date, self.description, + self.place, self.cause, self.private, self.source_list, + self.note, self.witness) = data + def set_id(self,id): """Sets the gramps ID for the place object""" self.id = id @@ -1752,17 +1795,34 @@ class Family(SourceNote): def __init__(self): """creates a new Family instance""" SourceNote.__init__(self) - father_id = None + self.father_id = None self.mother_id = None self.child_list = [] self.type = "Married" self.event_list = [] self.id = "" - self.photo_list = [] + self.media_list = [] self.attribute_list = [] self.lds_seal = None self.complete = 0 + + def serialize(self): + return (self.id, self.father_id, self.mother_id, + self.child_list, self.type, self.event_list, + self.media_list, self.attribute_list, self.lds_seal, + self.complete, + self.source_list, + self.note) + + def unserialize(self, data): + (self.id, self.father_id, self.mother_id, + self.child_list, self.type, self.event_list, + self.media_list, self.attribute_list, self.lds_seal, + self.complete, + self.source_list, + self.note) = data + def set_complete(self,val): self.complete = val @@ -1895,17 +1955,17 @@ class Family(SourceNote): """sets the event list to the passed list""" self.event_list = list - def add_photo(self,photo): - """Adds a Photo object to the Family instance's image list""" - self.photo_list.append(photo) + def add_media_object(self,photo): + """Adds a MediaObject object to the Family instance's image list""" + self.media_list.append(photo) - def get_photo_list(self): - """Returns the list of Photo objects""" - return self.photo_list + def get_media_list(self): + """Returns the list of MediaObject objects""" + return self.media_list - def set_photo_list(self,list): - """Sets the list of Photo objects""" - self.photo_list = list + def set_media_list(self,list): + """Sets the list of MediaObject objects""" + self.media_list = list def some_child_is_ancestor(self): for child in self.child_list: @@ -1922,9 +1982,15 @@ class Source: self.author = "" self.pubinfo = "" self.note = Note() - self.photo_list = [] + self.media_list = [] self.id = "" self.abbrev = "" + + def serialize(self): + return (self.id,self.title,self.author,self.pubinfo,self.note,self.media_list,self.abbrev) + + def unserialize(self,data): + (self.id,self.title,self.author,self.pubinfo,self.note,self.media_list,self.abbrev) = data def get_display_info(self): return [self.title,self.id,self.author,self.title.upper(),self.author.upper()] @@ -1937,17 +2003,17 @@ class Source: """returns the gramps' ID of the Source instance""" return self.id - def add_photo(self,photo): - """Adds a Photo object to the Source instance's image list""" - self.photo_list.append(photo) + def add_media_object(self,photo): + """Adds a MediaObject object to the Source instance's image list""" + self.media_list.append(photo) - def get_photo_list(self): - """Returns the list of Photo objects""" - return self.photo_list + def get_media_list(self): + """Returns the list of MediaObject objects""" + return self.media_list - def set_photo_list(self,list): - """Sets the list of Photo objects""" - self.photo_list = list + def set_media_list(self,list): + """Sets the list of MediaObject objects""" + self.media_list = list def set_title(self,title): """sets the title of the Source""" @@ -2171,20 +2237,24 @@ class GenderStats: return Person.unknown + +from bsddb3 import dbshelve, db + class GrampsDB: """GRAMPS database object. This object is a base class for other objects.""" def __init__(self): """creates a new GrampsDB""" + + self.person_map = dbshelve.open('person.db', dbname="people", filetype=db.DB_BTREE) + self.family_map = dbshelve.open('family.db', dbname="family", filetype=db.DB_BTREE) + self.place_map = dbshelve.open('place.db', dbname="places", filetype=db.DB_BTREE) + self.source_map = dbshelve.open('source.db', dbname="sources",filetype=db.DB_BTREE) + self.media_map = dbshelve.open('media.db', dbname="media", filetype=db.DB_BTREE) + self.event_map = dbshelve.open('event.db', dbname="events", filetype=db.DB_BTREE) + self.surnames = [] - self.person_map = {} - self.place_table = {} - self.place_map = {} - self.source_table = {} - self.source_map = {} - self.event_map = {} - self.family_map = {} self.iprefix = "I%04d" self.sprefix = "S%04d" self.oprefix = "O%04d" @@ -2220,30 +2290,68 @@ class GrampsDB: return self.person_map.keys() def sort_by_name(self,f,s): - n1 = self.person_map[f].primary_name.sname - n2 = self.person_map[s].primary_name.sname + n1 = self.person_map.get(str(f))[2].sname + n2 = self.person_map.get(str(s))[2].sname return cmp(n1,n2) def sort_person_keys(self): - keys = self.person_map.keys() - if type(keys) == type([]): - keys.sort(self.sort_by_name) - return keys + return self.person_map.keys() +# keys = self.person_map.keys() +# if type(keys) == type([]): +# keys.sort(self.sort_by_name) +# return keys def get_person_display(self,key): - return self.person_map[key].get_display_info() + data = self.person_map.get(str(key)) + + if data[1] == Person.male: + gender = const.male + elif data[1] == Person.female: + gender = const.female + else: + gender = const.unknown + + return [ data[2].get_name(), + data[0], + gender, + data[6], + data[5], + data[2].get_sort_name(), +# sort.build_sort_date(bday), +# sort.build_sort_date(dday), + data[6], + data[5], + GrampsCfg.display_surname(data[2])] + + def commit_person(self,person): + assert(person.get_id()) + self.person_map.put(str(person.get_id()),person.serialize()) + + def commit_media_object(self,object): + self.media_map.put(str(object.get_id()),object.serialize()) + + def commit_source(self,source): + self.source_map.put(str(source.get_id()),source.serialize()) + + def commit_place(self,place): + self.place_map.put(str(place.get_id()),place.serialize()) + + def commit_event(self,event): + self.event_map.put(str(event.get_id()),event.serialize()) + + def commit_family(self,family): + self.family_map.put(str(family.get_id()),family.serialize()) def build_person_display(self,nkey,okey=None): - person = self.person_map[nkey] - self.add_surname(person.get_primary_name().get_surname()) + pass +# name = self.person_map.get(str(nkey))[2] +# self.add_surname(name.get_surname()) def rebuild_person_table(self): pass def build_place_display(self,nkey,okey=None): - if okey and nkey != okey: - del self.place_table[okey] - self.place_table[nkey] = self.place_map[nkey].get_display_info() + pass def set_iprefix(self,val): if val: @@ -2302,25 +2410,7 @@ class GrampsDB: def new(self): """initializes the GrampsDB to empty values""" - # eliminate memory reference cycles for 1.5.2 garbage collection - for f in self.family_map.values(): - f.Father = None - f.Mother = None - f.Children = [] - self.family_map = {} - - for p in self.person_map.values(): - p.clear_parent_family_id_list() - p.clear_family_id_list() - self.surnames = [] - self.person_map = {} - self.source_map = {} - self.event_map = {} - self.source_table = {} - self.place_map = {} - self.place_table = {} - self.object_map = {} self.smap_index = 0 self.emap_index = 0 self.pmap_index = 0 @@ -2366,28 +2456,27 @@ class GrampsDB: def set_default_person(self,person): """sets the default Person to the passed instance""" - if (self.default): - self.default.set_ancestor(0) - self.default = person - if person: - self.default.set_ancestor(1) +# if (self.default): +# self.default.set_ancestor(0) + self.default = str(person) +# if person: +# self.default.set_ancestor(1) def get_default_person(self): """returns the default Person of the database""" - return self.default + if self.default == None: + return None + person = Person() + data = self.person_map.get(self.default) + person.unserialize(data) + return person def get_person(self,id): """returns a map of gramps's IDs to Person instances""" - return self.person_map[id] - - def get_person_id_map(self): - """returns a map of gramps's IDs to Person instances""" - return self.person_map - - def set_person_id_map(self,map): - """sets the map of gramps's IDs to Person instances""" - # Should recalculate self.genderStats here. - self.person_map = map + p = Person() + data = self.person_map.get(str(id)) + p.unserialize(data) + return p def get_place_id_map(self): """returns a map of gramps's IDs to Place instances""" @@ -2397,29 +2486,9 @@ class GrampsDB: """sets the map of gramps's IDs to Place instances""" self.place_map = map - def get_family_id_map(self): - """returns a map of gramps's IDs to Family instances""" - return self.family_map - def get_family_id(self,id): """returns a map of gramps's IDs to Family instances""" - return self.family_map[id] - - def set_family_id_map(self,map): - """sets the map of gramps's IDs to Family instances""" - self.family_map = map - - def get_source_map(self): - """returns a map of gramps's IDs to Source instances""" - return self.source_map - - def get_event_map(self): - """returns a map of gramps's IDs to Source instances""" - return self.event_map - - def get_object_map(self): - """returns a map of gramps's IDs to Object instances""" - return self.object_map + return self.family_map.get(str(id)) def get_save_path(self): """returns the save path of the file, or "" if one does not exist""" @@ -2433,39 +2502,39 @@ class GrampsDB: """returns a list of all Event types assocated with Person instances in the database""" map = {} - for person in self.person_map.values(): - for event_id in person.get_event_list(): - event = self.event_map[event_id] - map[event.get_name()] = 1 +# for person in self.person_map.values(): +# for event_id in person.get_event_list(): +# event = self.event_map[event_id] +# map[event.get_name()] = 1 return map.keys() def get_person_attribute_types(self): """returns a list of all Attribute types assocated with Person instances in the database""" map = {} - for key in self.person_map.keys(): - person = self.person_map[key] - for attr in person.get_attribute_list(): - map[attr.get_type()] = 1 +# for key in self.person_map.keys(): +# person = self.person_map[key] +# for attr in person.get_attribute_list(): +# map[attr.get_type()] = 1 return map.keys() def get_family_attribute_types(self): """returns a list of all Attribute types assocated with Family instances in the database""" map = {} - for family in self.family_map.values(): - for attr in family.get_attribute_list(): - map[attr.get_type()] = 1 +# for family in self.family_map.values(): +# for attr in family.get_attribute_list(): +# map[attr.get_type()] = 1 return map.keys() def get_family_event_types(self): """returns a list of all Event types assocated with Family instances in the database""" map = {} - for family in self.family_map.values(): - for event_id in family.get_event_list(): - event = self.event_map[event_id] - map[event.get_name()] = 1 +# for family in self.family_map.values(): +# for event_id in family.get_event_list(): +# event = self.event_map[event_id] +# map[event.get_name()] = 1 return map.keys() def get_place_ids(self): @@ -2476,34 +2545,35 @@ class GrampsDB: """returns a list of all relationship types assocated with Family instances in the database""" map = {} - for family in self.family_map.values(): - map[family.get_relationship()] = 1 +# for family in self.family_map.values(): +# map[family.get_relationship()] = 1 return map.keys() def remove_person_id(self,id): - self.genderStats.uncount_person (self.person_map[id]) - del self.person_map[id] +# self.genderStats.uncount_person (self.person_map[id]) + del self.person_map[str(id)] def remove_source_id(self,id): - del self.source_map[id] - del self.source_table[id] + del self.source_map[str(id)] def remove_event_id(self,id): - del self.event_map[id] + del self.event_map[str(id)] def add_person_as(self,person): - self.person_map[person.get_id()] = person - self.genderStats.count_person (person, self) + assert(person.get_id()) + self.person_map.put(str(person.get_id()),person.serialize()) +# self.genderStats.count_person (person, self) return person.get_id() def add_person(self,person): """adds a Person to the database, assigning a gramps' ID""" index = self.iprefix % self.pmap_index - while self.person_map.has_key(index): + while self.person_map.get(str(index)): self.pmap_index = self.pmap_index + 1 index = self.iprefix % self.pmap_index person.set_id(index) - self.person_map[index] = person + assert(person.get_id()) + self.person_map.put(str(index),person.serialize()) self.pmap_index = self.pmap_index + 1 self.genderStats.count_person (person, self) return index @@ -2518,25 +2588,34 @@ class GrampsDB: map - map build by findPerson of external to gramp's IDs""" idVal = str(idVal) + person = Person() if map.has_key(idVal): - person = self.person_map[map[idVal]] + person.unserialize(self.person_map.get(str(map[idVal]))) else: person = Person() map[idVal] = self.add_person(person) self.genderStats.count_person (person, self) return person + def has_person_id(self,val): + return self.person_map.get(str(val)) + def find_person_from_id(self,val): """finds a Person in the database from the passed gramps' ID. If no such Person exists, a new Person is added to the database.""" - - person = self.person_map.get(val) - if not person: - person = Person() - person.id = val - self.person_map[val] = person + + person = Person() + data = self.person_map.get(str(val)) + + if data: + person.unserialize(data) + else: + person.set_id(val) + assert(person.get_id()) + assert(person.get_id()[0] == 'I') + self.person_map.put(str(val), person.serialize()) self.pmap_index = self.pmap_index+1 - self.genderStats.count_person (person, self) +# self.genderStats.count_person (person, self) return person def add_person_no_map(self,person,id): @@ -2544,9 +2623,9 @@ class GrampsDB: id = str(id) person.set_id(id) - self.person_map[id] = person + self.person_map.set(str(id),person.serialize()) self.pmap_index = self.pmap_index+1 - self.genderStats.count_person (person, self) +# self.genderStats.count_person (person, self) return id def add_source(self,source): @@ -2554,40 +2633,39 @@ class GrampsDB: ID number""" index = self.sprefix % self.smap_index - while self.source_map.has_key(index): + while self.source_map.get(str(index)): self.smap_index = self.smap_index + 1 index = self.sprefix % self.smap_index source.set_id(index) - self.source_map[index] = source - self.source_table[index] = source.get_display_info() + self.source_map.put(str(index),source.serialize()) self.smap_index = self.smap_index + 1 return index def add_event(self,event): """adds a Event instance to the database, assigning it a gramps' ID number""" - + return Event() index = self.eprefix % self.emap_index - while self.event_map.has_key(index): + while self.event_map.get(str(index)): self.emap_index += 1 index = self.eprefix % self.emap_index event.set_id(index) - self.event_map[index] = event + self.event_map.put(str(index),event.serialize()) self.emap_index += 1 return index def add_source_no_map(self,source,index): """adds a Source to the database if the gramps' ID is known""" source.set_id(index) - self.source_map[index] = source + self.source_map.put(str(index),source.serialize()) self.smap_index = self.smap_index + 1 - self.source_table[index] = source.get_display_info() return index def add_event_no_map(self,event,index): """adds a Source to the database if the gramps' ID is known""" + return event.set_id(index) - self.event_map[index] = event + self.event_map.put(str(index),event.serialize()) self.emap_index += 1 return index @@ -2601,11 +2679,12 @@ class GrampsDB: map - map build by find_source of external to gramp's IDs""" if map.has_key(idVal): - source = self.source_map[map[idVal]] + data = self.source_map.get(str(map[idVal])) + source = Source() + source.unserialize(data) else: source = Source() map[idVal] = self.add_source(source) - self.source_table[map[idVal]] = source.get_display_info() return source def find_event(self,idVal,map): @@ -2617,10 +2696,12 @@ class GrampsDB: idVal - external ID number map - map build by find_source of external to gramp's IDs""" + event = Event() if map.has_key(idVal): - event = self.event_map[map[idVal]] + pass +# data = self.event_map.get(str(map[idVal])) +# event.serialize(data) else: - event = Event() map[idVal] = self.add_event(event) return event @@ -2628,37 +2709,41 @@ class GrampsDB: """finds a Source in the database from the passed gramps' ID. If no such Source exists, a new Source is added to the database.""" - if self.source_map.has_key(val): - source = self.source_map[val] + source = Source() + if self.source_map.get(str(val)): + source.unserialize(self.source_map.get(str(val))) else: - source = Source() self.add_source_no_map(source,val) - self.source_table[val] = source.get_display_info() return source def find_event_from_id(self,val): """finds a Family in the database from the passed gramps' ID. If no such Family exists, a new Family is added to the database.""" - - return self.event_map.get(val) +# data = self.event_map.get(str(val)) + if data: + event = Event() + event.unserialize(data) + return event + else: + return None def add_object(self,object): """adds an Object instance to the database, assigning it a gramps' ID number""" index = self.oprefix % self.omap_index - while self.object_map.has_key(index): + while self.media_map.get(str(index)): self.omap_index = self.omap_index + 1 index = self.oprefix % self.omap_index object.set_id(index) - self.object_map[index] = object + self.media_map.put(str(index),object.serialize()) self.omap_index = self.omap_index + 1 self.added_files.append(object) return index def get_object(self,id): - return self.object_map[id] + return self.media_map[str(id)] def find_object(self,idVal,map): """finds an Object in the database using the idVal and map @@ -2670,10 +2755,11 @@ class GrampsDB: map - map build by find_object of external to gramp's IDs""" idVal = str(idVal) + + object = MediaObject() if map.has_key(idVal): - object = self.object_map[map[idVal]] + object.unserialize(self.media_map.get(str(map[idVal]))) else: - object = Photo() map[idVal] = self.add_object(object) return object @@ -2687,11 +2773,11 @@ class GrampsDB: map - map build by find_object of external to gramp's IDs""" idVal = str(idVal) + object = MediaObject() if map.has_key(idVal): - object = self.object_map[map[idVal]] + object.unserialize(self.media_map.get(str(map[idVal]))) else: - object = Photo() - if self.object_map.has_key(idVal): + if self.media_map.get(str(idVal)): map[idVal] = self.add_object(object) else: map[idVal] = self.add_object_no_map(object,idVal) @@ -2701,7 +2787,7 @@ class GrampsDB: """adds an Object to the database if the gramps' ID is known""" index = str(index) object.set_id(index) - self.object_map[index] = object + self.media_map.put(str(index),object.serialize()) self.omap_index = self.omap_index + 1 self.added_files.append(object) return index @@ -2711,10 +2797,10 @@ class GrampsDB: If no such Source exists, a new Source is added to the database.""" val = str(idVal) - if self.object_map.has_key(val): - object = self.object_map[val] + object = MediaObject() + if self.media_map.get(str(val)): + object.unserialize(self.media_map.get(str(val))) else: - object = Photo() self.add_object_no_map(object,val) return object @@ -2723,25 +2809,22 @@ class GrampsDB: ID number""" index = self.pprefix % self.lmap_index - while self.place_map.has_key(index): + while self.place_map.get(str(index)): self.lmap_index = self.lmap_index + 1 index = self.pprefix % self.lmap_index place.set_id(index) - self.place_map[index] = place + self.place_map.put(str(index),place.serialize()) self.lmap_index = self.lmap_index + 1 - self.place_table[index] = place.get_display_info() return index def remove_object(self,id): - del self.object_map[id] + del self.media_map[str(id)] def remove_place(self,id): - del self.place_map[id] - del self.place_table[id] + del self.place_map[str(id)] def add_place_as(self,place): - self.place_map[place.get_id()] = place - self.place_table[place.get_id()] = place.get_display_info() + self.place_map.put(str(place.get_id()),place.serialize()) return place.get_id() def find_place_no_conflicts(self,idVal,map): @@ -2754,7 +2837,9 @@ class GrampsDB: map - map build by findPlace of external to gramp's IDs""" if map.has_key(idVal): - place = self.place_map[map[idVal]] + place = Place() + data = self.place_map[map[idVal]] + place.unserialize(data) else: place = Place() if self.place_map.has_key(idVal): @@ -2762,6 +2847,7 @@ class GrampsDB: else: place.set_id(idVal) map[idVal] = self.add_place_as(place) + self.place_map.put(str(idVal),place.serialize()) return place def add_place_no_map(self,place,index): @@ -2769,26 +2855,28 @@ class GrampsDB: index = str(index) place.set_id(index) - self.place_map[index] = place + self.place_map.put(str(index), place.serialize()) self.lmap_index = self.lmap_index + 1 - self.place_table[index] = place.get_display_info() return index def find_place_from_id(self,val): """finds a Place in the database from the passed gramps' ID. If no such Place exists, a new Place is added to the database.""" - place = self.place_map.get(val) - if not place: - place = Place() + data = self.place_map.get(str(val)) + place = Place() + if not data: place.id = val - self.place_map[val] = place + self.place_map.put(str(val),place.serialize()) self.lmap_index = self.lmap_index + 1 - self.place_table[val] = place.get_display_info() + else: + place.unserialize(data) return place def sortbyplace(self,f,s): - return cmp(self.place_table[f][7],self.place_table[s][7]) + fp = self.place_map[f][0].upper() + sp = self.place_map[f][0].upper() + return cmp(fp,sp) def sort_place_keys(self): keys = self.place_map.keys() @@ -2800,46 +2888,54 @@ class GrampsDB: return self.place_map.keys() def get_place_id(self,key): - return self.place_map[key] + place = Place() + place.serialize(self.place_map.get(str(key))) + return place def get_place_display(self,key): - return self.place_table[key] + # fix this up better + place = Place() + place.unserialize(self.place_map[key]) + return place.get_display_info() def get_source_keys(self): - return self.source_table.keys() + return self.source_map.keys() + + def get_object_keys(self): + return self.media_map.keys() def sortbysource(self,f,s): - return cmp(self.source_table[f][3],self.source_table[s][3]) + f1 = self.source_map[f].title.upper() + s1 = self.source_map[s].title.upper() + return cmp(f1,s1) def set_source_keys(self): - keys = self.source_table.keys() + keys = self.source_map.keys() if type(keys) == type([]): keys.sort(self.sortbyplace) return keys def get_source_display(self,key): - return self.source_table[key] + source = Source() + source.unserialize(self.source_map.get(str(key))) + return source.get_display_info() def get_source(self,key): return self.source_map[key] def build_source_display(self,nkey,okey=None): - if nkey != okey and okey != None: - del self.source_table[okey] - if self.source_table.has_key(nkey): - del self.source_table[nkey] - self.source_table[nkey] = self.source_map[nkey].get_display_info() + pass def new_family(self): """adds a Family to the database, assigning a gramps' ID""" index = self.fprefix % self.fmap_index - while self.family_map.has_key(index): + while self.family_map.get(str(index)): self.fmap_index = self.fmap_index + 1 index = self.fprefix % self.fmap_index self.fmap_index = self.fmap_index + 1 family = Family() family.set_id(index) - self.family_map[index] = family + self.family_map.put(str(index),family.serialize()) return family def new_family_no_map(self,id): @@ -2849,7 +2945,7 @@ class GrampsDB: family = Family() id = str(id) family.set_id(id) - self.family_map[id] = family + self.family_map.put(str(id),family.serialize()) self.fmap_index = self.fmap_index + 1 return family @@ -2863,7 +2959,9 @@ class GrampsDB: map - map build by find_family_with_map of external to gramp's IDs""" if map.has_key(idVal): - family = self.family_map[map[idVal]] + family = Family() + data = self.family_map.get(str(map[idVal])) + family.unserialize(data) else: family = self.new_family() map[idVal] = family.get_id() @@ -2873,24 +2971,31 @@ class GrampsDB: """finds a Family in the database from the passed gramps' ID. If no such Family exists, a new Family is added to the database.""" - family = self.family_map.get(val) - if not family: - family = Family() + family = Family() + data = self.family_map.get(str(val)) + if data: + family.unserialize(data) + else: family.id = val - self.family_map[val] = family + self.family_map.put(str(val),family.serialize()) self.fmap_index = self.fmap_index + 1 return family def find_family_from_id(self,val): """finds a Family in the database from the passed gramps' ID. If no such Family exists, a new Family is added to the database.""" - - return self.family_map.get(val) + data = self.family_map.get(str(val)) + if data: + family = Family() + family.unserialize(data) + return family + else: + return None def delete_family(self,family_id): """deletes the Family instance from the database""" - if self.family_map.has_key(family_id): - del self.family_map[family_id] + if self.family_map.get(str(family_id)): + del self.family_map[str(family_id)] def find_person_no_conflicts(self,idVal,map): """finds a Person in the database using the idVal and map @@ -2901,11 +3006,11 @@ class GrampsDB: idVal - external ID number map - map build by findPerson of external to gramp's IDs""" + person = Person() if map.has_key(idVal): - person = self.person_map[map[idVal]] + person.serialize(self.person_map.get(str(map[idVal]))) else: - person = Person() - if self.person_map.has_key(idVal): + if self.person_map.get(str(idVal)): map[idVal] = self.add_person(person) else: person.set_id(idVal) @@ -2922,7 +3027,8 @@ class GrampsDB: map - map build by findFamily of external to gramp's IDs""" if map.has_key(idVal): - family = self.family_map[map[idVal]] + family = Family() + family.unserialize(self.family_map.get(str(map[idVal]))) else: if self.family_map.has_key(idVal): family = self.new_family() @@ -2940,11 +3046,11 @@ class GrampsDB: idVal - external ID number map - map build by findSource of external to gramp's IDs""" + source = Source() if map.has_key(idVal): - source = self.source_map[map[idVal]] + source.unserialize(self.source_map.get(str(map[idVal]))) else: - source = Source() - if self.source_map.has_key(idVal): + if self.source_map.get(str(idVal)): map[idVal] = self.add_source(source) else: map[idVal] = self.add_source(source) diff --git a/gramps2/src/Witness.py b/gramps2/src/Witness.py index 79226e955..979211352 100644 --- a/gramps2/src/Witness.py +++ b/gramps2/src/Witness.py @@ -68,8 +68,8 @@ class WitnessTab: for s in self.list: if s.get_type() == RelLib.Event.ID: id = s.get_value() - if self.db.get_person_id_map().has_key(id): - n = self.db.get_person(id).get_primary_name().get_name() + if self.db.has_person_id(id): + n = self.db.find_person_from_id(id).get_primary_name().get_name() else: n = _('Unknown') self.model.add([n,s.get_value()],s) diff --git a/gramps2/src/WriteXML.py b/gramps2/src/WriteXML.py index c57421e65..daf73932f 100644 --- a/gramps2/src/WriteXML.py +++ b/gramps2/src/WriteXML.py @@ -268,7 +268,7 @@ class XmlWriter: self.dump_ordinance("endowment",person.get_lds_endowment(),3) self.dump_ordinance("sealed_to_parents",person.get_lds_sealing(),3) - self.write_photo_list(person.get_photo_list()) + self.write_media_list(person.get_media_list()) if len(person.get_address_list()) > 0: for address in person.get_address_list(): @@ -329,7 +329,7 @@ class XmlWriter: self.dump_event(event,3) self.dump_ordinance("sealed_to_spouse",family.get_lds_sealing(),3) - self.write_photo_list(family.get_photo_list()) + self.write_media_list(family.get_media_list()) if len(family.get_child_id_list()) > 0: for person in family.get_child_id_list(): @@ -357,7 +357,7 @@ class XmlWriter: self.write_line("sabbrev",source.get_abbreviation(),3) if source.get_note() != "": self.write_note("note",source.get_note_object(),3) - self.write_photo_list(source.get_photo_list()) + self.write_media_list(source.get_media_list()) self.g.write(" \n") self.g.write(" \n") @@ -683,7 +683,7 @@ class XmlWriter: self.write_note("note",attr.get_note_object(),4) self.g.write('%s\n' % sp) - def write_photo_list(self,list,indent=3): + def write_media_list(self,list,indent=3): sp = ' '*indent for photo in list: mobj = photo.get_reference() @@ -714,7 +714,7 @@ class XmlWriter: id = place.get_id() main_loc = place.get_main_location() llen = len(place.get_alternate_locations()) + len(place.get_url_list()) + \ - len(place.get_photo_list()) + len(place.get_source_references()) + len(place.get_media_list()) + len(place.get_source_references()) ml_empty = main_loc.is_empty() note = place.get_note() @@ -736,7 +736,7 @@ class XmlWriter: self.dump_location(main_loc) for loc in place.get_alternate_locations(): self.dump_location(loc) - self.write_photo_list(place.get_photo_list()) + self.write_media_list(place.get_media_list()) self.write_url_list(place.get_url_list()) if note != "": self.write_note("note",place.get_note_object(),3) diff --git a/gramps2/src/calendars/Makefile.in b/gramps2/src/calendars/Makefile.in index 9b9bceac9..567128305 100644 --- a/gramps2/src/calendars/Makefile.in +++ b/gramps2/src/calendars/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7.8 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, @@ -17,21 +17,45 @@ # This is the src/calendars level Makefile for Gramps # Use GNU make's ':=' syntax for nice wildcard use. # If not using GNU make, then list all .py files individually +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 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 = : @@ -39,54 +63,28 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +EXEEXT = @EXEEXT@ +OBJEXT = @OBJEXT@ +PATH_SEPARATOR = @PATH_SEPARATOR@ + pkgdatadir = $(datadir)/@PACKAGE@/calendars -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BINSH = @BINSH@ CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EXEEXT = @EXEEXT@ GNOMEHELP = @GNOMEHELP@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ ICONV = @ICONV@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LANGUAGES = @LANGUAGES@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ MOFILES = @MOFILES@ MSGCONV = @MSGCONV@ MSGFMT = @MSGFMT@ -OBJEXT = @OBJEXT@ 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@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ @@ -96,44 +94,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@ 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@/plugins pkgpythondir = @pkgpythondir@/plugins -prefix = @prefix@ -program_transform_name = @program_transform_name@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ pkgpython_PYTHON = \ Islamic.py \ @@ -142,12 +115,11 @@ pkgpython_PYTHON = \ GRAMPS_PY_MODPATH = "../" subdir = src/calendars -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = DIST_SOURCES = py_compile = $(top_srcdir)/py-compile -DIST_COMMON = $(pkgpython_PYTHON) $(srcdir)/Makefile.in Makefile.am +DIST_COMMON = $(pkgpython_PYTHON) Makefile.am Makefile.in all: all-am .SUFFIXES: @@ -162,12 +134,11 @@ install-pkgpythonPYTHON: $(pkgpython_PYTHON) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(pkgpythondir) @list='$(pkgpython_PYTHON)'; dlist=''; for p in $$list; do\ - if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \ - if test -f $$b$$p; then \ + if test -f $(srcdir)/$$p; then \ d=`echo "$$p" | sed -e 's,^.*/,,'`; \ dlist="$$dlist $$d"; \ - echo " $(pkgpythonPYTHON_INSTALL) $$b$$p $(DESTDIR)$(pkgpythondir)/$$d"; \ - $(pkgpythonPYTHON_INSTALL) $$b$$p $(DESTDIR)$(pkgpythondir)/$$d; \ + echo " $(pkgpythonPYTHON_INSTALL) $(srcdir)/$$p $(DESTDIR)$(pkgpythondir)/$$d"; \ + $(pkgpythonPYTHON_INSTALL) $(srcdir)/$$p $(DESTDIR)$(pkgpythondir)/$$d; \ else :; fi; \ done; \ PYTHON=$(PYTHON) $(py_compile) --basedir $(DESTDIR)$(pkgpythondir) $$dlist @@ -183,22 +154,13 @@ uninstall-pkgpythonPYTHON: tags: TAGS TAGS: -ctags: CTAGS -CTAGS: - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @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 \ @@ -224,6 +186,7 @@ all-am: Makefile installdirs: $(mkinstalldirs) $(DESTDIR)$(pkgpythondir) + install: install-am install-exec: install-exec-am install-data: install-data-am @@ -243,7 +206,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -253,7 +216,7 @@ clean: clean-am clean-am: clean-generic mostlyclean-am distclean: distclean-am - -rm -f Makefile + distclean-am: clean-am distclean-generic dvi: dvi-am @@ -275,21 +238,13 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f Makefile + maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - uninstall-am: uninstall-info-am uninstall-pkgpythonPYTHON .PHONY: all all-am check check-am clean clean-generic distclean \ @@ -298,8 +253,8 @@ uninstall-am: uninstall-info-am uninstall-pkgpythonPYTHON install-exec-am install-info install-info-am install-man \ install-pkgpythonPYTHON 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 \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + uninstall uninstall-am uninstall-info-am \ uninstall-pkgpythonPYTHON diff --git a/gramps2/src/data/Makefile.in b/gramps2/src/data/Makefile.in index dd609b9f5..5ddf0803b 100644 --- a/gramps2/src/data/Makefile.in +++ b/gramps2/src/data/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7.8 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, @@ -13,75 +13,73 @@ # PARTICULAR PURPOSE. @SET_MAKE@ +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 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 = : + +EXEEXT = @EXEEXT@ +OBJEXT = @OBJEXT@ +PATH_SEPARATOR = @PATH_SEPARATOR@ pkgdatadir = $(datadir)/@PACKAGE@/data -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BINSH = @BINSH@ CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EXEEXT = @EXEEXT@ GNOMEHELP = @GNOMEHELP@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ ICONV = @ICONV@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LANGUAGES = @LANGUAGES@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ MOFILES = @MOFILES@ MSGCONV = @MSGCONV@ MSGFMT = @MSGFMT@ -OBJEXT = @OBJEXT@ 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@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ @@ -91,43 +89,18 @@ 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@ 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@ # This is the src/data level Makefile SUBDIRS = templates @@ -136,19 +109,17 @@ pkgdata_DATA = gedcom.xml EXTRA_DIST = $(pkgdata_DATA) subdir = src/data -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = DIST_SOURCES = DATA = $(pkgdata_DATA) -RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ - ps-recursive install-info-recursive uninstall-info-recursive \ - all-recursive install-data-recursive install-exec-recursive \ - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive -DIST_COMMON = $(srcdir)/Makefile.in Makefile.am +RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ + uninstall-info-recursive all-recursive install-data-recursive \ + install-exec-recursive installdirs-recursive install-recursive \ + uninstall-recursive check-recursive installcheck-recursive +DIST_COMMON = Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) all: all-recursive @@ -232,17 +203,10 @@ tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done ETAGS = etags ETAGSFLAGS = -CTAGS = ctags -CTAGSFLAGS = - tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -258,15 +222,9 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - if (etags --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - else \ - include_option=--include; \ - fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ fi; \ done; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -279,41 +237,20 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @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 \ @@ -372,7 +309,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -382,7 +319,7 @@ clean: clean-recursive clean-am: clean-generic mostlyclean-am distclean: distclean-recursive - -rm -f Makefile + distclean-am: clean-am distclean-generic distclean-tags dvi: dvi-recursive @@ -404,39 +341,30 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-recursive - -rm -f Makefile + maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-recursive mostlyclean-am: mostlyclean-generic -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - uninstall-am: uninstall-info-am uninstall-pkgdataDATA uninstall-info: uninstall-info-recursive -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ - clean-generic clean-recursive ctags ctags-recursive distclean \ - distclean-generic distclean-recursive distclean-tags distdir \ - dvi dvi-am dvi-recursive info info-am info-recursive install \ - install-am install-data install-data-am install-data-recursive \ +.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ + clean-generic clean-recursive distclean distclean-generic \ + distclean-recursive distclean-tags distdir dvi dvi-am \ + dvi-recursive info info-am info-recursive install install-am \ + install-data install-data-am install-data-recursive \ install-exec install-exec-am install-exec-recursive \ install-info install-info-am install-info-recursive install-man \ install-pkgdataDATA install-recursive install-strip \ installcheck installcheck-am installdirs installdirs-am \ installdirs-recursive maintainer-clean maintainer-clean-generic \ maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \ - ps-recursive tags tags-recursive uninstall uninstall-am \ - uninstall-info-am uninstall-info-recursive \ + mostlyclean-recursive tags tags-recursive uninstall \ + uninstall-am uninstall-info-am uninstall-info-recursive \ uninstall-pkgdataDATA uninstall-recursive # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/gramps2/src/data/templates/Makefile.in b/gramps2/src/data/templates/Makefile.in index efba7dc50..be06b8f25 100644 --- a/gramps2/src/data/templates/Makefile.in +++ b/gramps2/src/data/templates/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7.8 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, @@ -13,21 +13,45 @@ # PARTICULAR PURPOSE. @SET_MAKE@ +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 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 = : @@ -35,54 +59,28 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +EXEEXT = @EXEEXT@ +OBJEXT = @OBJEXT@ +PATH_SEPARATOR = @PATH_SEPARATOR@ + pkgdatadir = $(datadir)/@PACKAGE@/data/templates -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BINSH = @BINSH@ CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EXEEXT = @EXEEXT@ GNOMEHELP = @GNOMEHELP@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ ICONV = @ICONV@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LANGUAGES = @LANGUAGES@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ MOFILES = @MOFILES@ MSGCONV = @MSGCONV@ MSGFMT = @MSGFMT@ -OBJEXT = @OBJEXT@ 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@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ @@ -92,43 +90,18 @@ 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@ 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@ # This is the src/data/templates level Makefile pkgdata_DATA = marble.tpkg \ @@ -140,13 +113,12 @@ pkgdata_DATA = marble.tpkg \ EXTRA_DIST = $(pkgdata_DATA) subdir = src/data/templates -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = DIST_SOURCES = DATA = $(pkgdata_DATA) -DIST_COMMON = $(srcdir)/Makefile.in Makefile.am +DIST_COMMON = Makefile.am Makefile.in all: all-am .SUFFIXES: @@ -177,22 +149,13 @@ uninstall-pkgdataDATA: tags: TAGS TAGS: -ctags: CTAGS -CTAGS: - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @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 \ @@ -218,6 +181,7 @@ all-am: Makefile $(DATA) installdirs: $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) + install: install-am install-exec: install-exec-am install-data: install-data-am @@ -237,7 +201,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -247,7 +211,7 @@ clean: clean-am clean-am: clean-generic mostlyclean-am distclean: distclean-am - -rm -f Makefile + distclean-am: clean-am distclean-generic dvi: dvi-am @@ -269,21 +233,13 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f Makefile + maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - uninstall-am: uninstall-info-am uninstall-pkgdataDATA .PHONY: all all-am check check-am clean clean-generic distclean \ @@ -292,8 +248,8 @@ uninstall-am: uninstall-info-am uninstall-pkgdataDATA install-exec-am install-info install-info-am install-man \ install-pkgdataDATA 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-pkgdataDATA + mostlyclean mostlyclean-generic uninstall uninstall-am \ + uninstall-info-am uninstall-pkgdataDATA # 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. diff --git a/gramps2/src/docgen/AbiWord2Doc.py b/gramps2/src/docgen/AbiWord2Doc.py index 7a35ac43e..ab82447a1 100644 --- a/gramps2/src/docgen/AbiWord2Doc.py +++ b/gramps2/src/docgen/AbiWord2Doc.py @@ -161,9 +161,9 @@ class AbiWordDoc(BaseDoc.BaseDoc): def close(self): """Write the trailing information and closes the file""" self.f.write('\n') - if len(self.photo_list) > 0: + if len(self.media_list) > 0: self.f.write('\n') - for file_tuple in self.photo_list: + for file_tuple in self.media_list: tag = self.imap[file_tuple[0]] img = ImgManip.ImgManip(file_tuple[0]) @@ -183,7 +183,7 @@ class AbiWordDoc(BaseDoc.BaseDoc): os.environ["FILE"] = self.filename os.system ('%s "$FILE" &' % app) - def add_photo(self,name,pos,x_cm,y_cm): + def add_media_object(self,name,pos,x_cm,y_cm): try: image = ImgManip.ImgManip(name) @@ -200,7 +200,7 @@ class AbiWordDoc(BaseDoc.BaseDoc): act_height = y_cm act_width = x_cm*aspect_ratio - self.photo_list.append((name,act_width,act_height)) + self.media_list.append((name,act_width,act_height)) tag = "image%d" % self.icount diff --git a/gramps2/src/docgen/HtmlDoc.py b/gramps2/src/docgen/HtmlDoc.py index bef2fe9d2..d528a30b9 100644 --- a/gramps2/src/docgen/HtmlDoc.py +++ b/gramps2/src/docgen/HtmlDoc.py @@ -356,7 +356,7 @@ class HtmlDoc(BaseDoc.BaseDoc): except: raise Errors.ReportError(_("Could not create %s") % fname) - def add_photo(self,name,pos,x,y): + def add_media_object(self,name,pos,x,y): self.empty = 0 size = int(max(x,y) * float(150.0/2.54)) refname = "is%s" % os.path.basename(name) diff --git a/gramps2/src/docgen/KwordDoc.py b/gramps2/src/docgen/KwordDoc.py index e9188730b..1cb9e31bf 100644 --- a/gramps2/src/docgen/KwordDoc.py +++ b/gramps2/src/docgen/KwordDoc.py @@ -49,7 +49,7 @@ def points(val): class KwordDoc(BaseDoc.BaseDoc): def open(self,filename): - self.photo_list = [] + self.media_list = [] if filename[-4:] != ".kwd": self.filename = filename + ".kwd" @@ -149,7 +149,7 @@ class KwordDoc(BaseDoc.BaseDoc): self.f.write('\n') self.frameset_flg= 0 - for p in self.photo_list: + for p in self.media_list: self.f.write('\n' % p[1]) self.f.write('\n') self.f.write('\n') - for file in self.photo_list: + for file in self.media_list: self.f.write('\n' % tag txt = txt + '\n' diff --git a/gramps2/src/docgen/LaTeXDoc.py b/gramps2/src/docgen/LaTeXDoc.py index cce67784e..93026c37f 100644 --- a/gramps2/src/docgen/LaTeXDoc.py +++ b/gramps2/src/docgen/LaTeXDoc.py @@ -378,7 +378,7 @@ class LaTeXDoc(BaseDoc.BaseDoc): if self.curcol < self.numcols: self.f.write('& ') - def add_photo(self,name,pos,x,y): + def add_media_object(self,name,pos,x,y): """Add photo to report""" try: diff --git a/gramps2/src/docgen/Makefile.in b/gramps2/src/docgen/Makefile.in index 076144be1..4705363cf 100644 --- a/gramps2/src/docgen/Makefile.in +++ b/gramps2/src/docgen/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7.8 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, @@ -17,75 +17,73 @@ # This is the src/docgen level Makefile for Gramps # Use GNU make's ':=' syntax for nice wildcard use. # If not using GNU make, then list all .py files individually +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@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EXEEXT = @EXEEXT@ GNOMEHELP = @GNOMEHELP@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ ICONV = @ICONV@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LANGUAGES = @LANGUAGES@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ MOFILES = @MOFILES@ MSGCONV = @MSGCONV@ MSGFMT = @MSGFMT@ -OBJEXT = @OBJEXT@ 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@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ @@ -95,44 +93,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@ 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@/docgen pkgpythondir = @pkgpythondir@/docgen -prefix = @prefix@ -program_transform_name = @program_transform_name@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ pkgpython_PYTHON = \ AbiWord2Doc.py\ @@ -149,12 +122,11 @@ pkgpython_PYTHON = \ GRAMPS_PY_MODPATH = "../" subdir = src/docgen -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = DIST_SOURCES = py_compile = $(top_srcdir)/py-compile -DIST_COMMON = $(pkgpython_PYTHON) $(srcdir)/Makefile.in Makefile.am +DIST_COMMON = $(pkgpython_PYTHON) Makefile.am Makefile.in all: all-am .SUFFIXES: @@ -169,12 +141,11 @@ install-pkgpythonPYTHON: $(pkgpython_PYTHON) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(pkgpythondir) @list='$(pkgpython_PYTHON)'; dlist=''; for p in $$list; do\ - if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \ - if test -f $$b$$p; then \ + if test -f $(srcdir)/$$p; then \ d=`echo "$$p" | sed -e 's,^.*/,,'`; \ dlist="$$dlist $$d"; \ - echo " $(pkgpythonPYTHON_INSTALL) $$b$$p $(DESTDIR)$(pkgpythondir)/$$d"; \ - $(pkgpythonPYTHON_INSTALL) $$b$$p $(DESTDIR)$(pkgpythondir)/$$d; \ + echo " $(pkgpythonPYTHON_INSTALL) $(srcdir)/$$p $(DESTDIR)$(pkgpythondir)/$$d"; \ + $(pkgpythonPYTHON_INSTALL) $(srcdir)/$$p $(DESTDIR)$(pkgpythondir)/$$d; \ else :; fi; \ done; \ PYTHON=$(PYTHON) $(py_compile) --basedir $(DESTDIR)$(pkgpythondir) $$dlist @@ -190,22 +161,13 @@ uninstall-pkgpythonPYTHON: tags: TAGS TAGS: -ctags: CTAGS -CTAGS: - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @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 \ @@ -231,6 +193,7 @@ all-am: Makefile installdirs: $(mkinstalldirs) $(DESTDIR)$(pkgpythondir) + install: install-am install-exec: install-exec-am install-data: install-data-am @@ -250,7 +213,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -260,7 +223,7 @@ clean: clean-am clean-am: clean-generic mostlyclean-am distclean: distclean-am - -rm -f Makefile + distclean-am: clean-am distclean-generic dvi: dvi-am @@ -282,21 +245,13 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f Makefile + maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - uninstall-am: uninstall-info-am uninstall-pkgpythonPYTHON .PHONY: all all-am check check-am clean clean-generic distclean \ @@ -305,8 +260,8 @@ uninstall-am: uninstall-info-am uninstall-pkgpythonPYTHON install-exec-am install-info install-info-am install-man \ install-pkgpythonPYTHON 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 \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + uninstall uninstall-am uninstall-info-am \ uninstall-pkgpythonPYTHON diff --git a/gramps2/src/docgen/OpenOfficeDoc.py b/gramps2/src/docgen/OpenOfficeDoc.py index 9025098f0..bdc91b069 100644 --- a/gramps2/src/docgen/OpenOfficeDoc.py +++ b/gramps2/src/docgen/OpenOfficeDoc.py @@ -369,7 +369,7 @@ class OpenOfficeDoc(BaseDoc.BaseDoc): os.environ["FILE"] = self.filename os.system ('%s "$FILE" &' % app) - def add_photo(self,name,pos,x_cm,y_cm): + def add_media_object(self,name,pos,x_cm,y_cm): # try to open the image. If the open fails, it probably wasn't # a valid image (could be a PDF, or a non-image) @@ -387,9 +387,9 @@ class OpenOfficeDoc(BaseDoc.BaseDoc): act_height = y_cm act_width = x_cm/ratio - photo_list_item = (name,act_width,act_height) - if not photo_list_item in self.photo_list: - self.photo_list.append(photo_list_item) + media_list_item = (name,act_width,act_height) + if not media_list_item in self.media_list: + self.media_list.append(media_list_item) base = os.path.basename(name) tag = string.replace(base,'.','_') @@ -463,7 +463,7 @@ class OpenOfficeDoc(BaseDoc.BaseDoc): file.write(self.meta_xml,str("meta.xml")) file.write(self.styles_xml,str("styles.xml")) - for image in self.photo_list: + for image in self.media_list: base = os.path.basename(image[0]) file.write(image[0], str("Pictures/%s" % base)) file.close() @@ -727,7 +727,7 @@ class OpenOfficeDoc(BaseDoc.BaseDoc): self.f.write('') - for image in self.photo_list: + for image in self.media_list: i = image[0] base = os.path.basename(i) self.f.write(' 0 + return len(person.get_media_list()) > 0 #------------------------------------------------------------------------ # diff --git a/gramps2/src/filters/Makefile.in b/gramps2/src/filters/Makefile.in index d3953f6d5..8c64a01e3 100644 --- a/gramps2/src/filters/Makefile.in +++ b/gramps2/src/filters/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7.8 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, @@ -13,75 +13,73 @@ # PARTICULAR PURPOSE. @SET_MAKE@ +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@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EXEEXT = @EXEEXT@ GNOMEHELP = @GNOMEHELP@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ ICONV = @ICONV@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LANGUAGES = @LANGUAGES@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ MOFILES = @MOFILES@ MSGCONV = @MSGCONV@ MSGFMT = @MSGFMT@ -OBJEXT = @OBJEXT@ 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@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ @@ -91,44 +89,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@ 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@/filters pkgpythondir = @pkgpythondir@/filters -prefix = @prefix@ -program_transform_name = @program_transform_name@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ # This is the src/filters level Makefile for Gramps # Use GNU make's ':=' syntax for nice wildcard use. @@ -156,12 +129,11 @@ pkgpython_PYTHON = \ GRAMPS_PY_MODPATH = "../" subdir = src/filters -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = DIST_SOURCES = py_compile = $(top_srcdir)/py-compile -DIST_COMMON = $(pkgpython_PYTHON) $(srcdir)/Makefile.in Makefile.am +DIST_COMMON = $(pkgpython_PYTHON) Makefile.am Makefile.in all: all-am .SUFFIXES: @@ -176,12 +148,11 @@ install-pkgpythonPYTHON: $(pkgpython_PYTHON) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(pkgpythondir) @list='$(pkgpython_PYTHON)'; dlist=''; for p in $$list; do\ - if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \ - if test -f $$b$$p; then \ + if test -f $(srcdir)/$$p; then \ d=`echo "$$p" | sed -e 's,^.*/,,'`; \ dlist="$$dlist $$d"; \ - echo " $(pkgpythonPYTHON_INSTALL) $$b$$p $(DESTDIR)$(pkgpythondir)/$$d"; \ - $(pkgpythonPYTHON_INSTALL) $$b$$p $(DESTDIR)$(pkgpythondir)/$$d; \ + echo " $(pkgpythonPYTHON_INSTALL) $(srcdir)/$$p $(DESTDIR)$(pkgpythondir)/$$d"; \ + $(pkgpythonPYTHON_INSTALL) $(srcdir)/$$p $(DESTDIR)$(pkgpythondir)/$$d; \ else :; fi; \ done; \ PYTHON=$(PYTHON) $(py_compile) --basedir $(DESTDIR)$(pkgpythondir) $$dlist @@ -197,22 +168,13 @@ uninstall-pkgpythonPYTHON: tags: TAGS TAGS: -ctags: CTAGS -CTAGS: - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @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 \ @@ -238,6 +200,7 @@ all-am: Makefile installdirs: $(mkinstalldirs) $(DESTDIR)$(pkgpythondir) + install: install-am install-exec: install-exec-am install-data: install-data-am @@ -257,7 +220,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -267,7 +230,7 @@ clean: clean-am clean-am: clean-generic mostlyclean-am distclean: distclean-am - -rm -f Makefile + distclean-am: clean-am distclean-generic dvi: dvi-am @@ -289,21 +252,13 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f Makefile + maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - uninstall-am: uninstall-info-am uninstall-pkgpythonPYTHON .PHONY: all all-am check check-am clean clean-generic distclean \ @@ -312,8 +267,8 @@ uninstall-am: uninstall-info-am uninstall-pkgpythonPYTHON install-exec-am install-info install-info-am install-man \ install-pkgpythonPYTHON 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 \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + uninstall uninstall-am uninstall-info-am \ uninstall-pkgpythonPYTHON diff --git a/gramps2/src/gramps_main.py b/gramps2/src/gramps_main.py index 2ca3d00f2..4aaa69d97 100755 --- a/gramps2/src/gramps_main.py +++ b/gramps2/src/gramps_main.py @@ -924,10 +924,10 @@ class Gramps: if Utils.wasHistory_broken(): self.clear_history() Utils.clearHistory_broken() + self.full_update() + self.goto_active_person() if not self.active_person: self.change_active_person(self.find_initial_person()) - self.goto_active_person() - self.full_update() def full_update(self): """Brute force display update, updating all the pages""" @@ -1066,8 +1066,6 @@ class Gramps: GrampsCfg.save_last_file("") self.topWindow.set_resizable(gtk.TRUE) self.people_view.apply_filter() - self.goto_active_person(1) - def on_ok_button2_clicked(self,obj): filename = obj.get_filename() @@ -1088,32 +1086,32 @@ class Gramps: # File is lost => remove all references and the object itself mobj = ObjectMap[ObjectId] for p in self.db.get_family_id_map().values(): - nl = p.get_photo_list() + nl = p.get_media_list() for o in nl: if o.get_reference() == mobj: nl.remove(o) - p.set_photo_list(nl) + p.set_media_list(nl) for key in self.db.get_person_keys(): p = self.db.get_person(key) - nl = p.get_photo_list() + nl = p.get_media_list() for o in nl: if o.get_reference() == mobj: nl.remove(o) - p.set_photo_list(nl) + p.set_media_list(nl) for key in self.db.get_source_keys(): p = self.db.get_source(key) - nl = p.get_photo_list() + nl = p.get_media_list() for o in nl: if o.get_reference() == mobj: nl.remove(o) - p.set_photo_list(nl) + p.set_media_list(nl) for key in self.db.get_place_id_keys(): p = self.db.get_place_id(key) - nl = p.get_photo_list() + nl = p.get_media_list() for o in nl: if o.get_reference() == mobj: nl.remove(o) - p.set_photo_list(nl) + p.set_media_list(nl) self.db.remove_object(ObjectId) def leave_clicked(): @@ -1728,16 +1726,17 @@ class Gramps: self.statusbar.set_progress_percentage(1.0) - self.change_active_person(self.find_initial_person()) - self.full_update() + + self.change_active_person(self.find_initial_person()) + self.goto_active_person() self.statusbar.set_progress_percentage(0.0) return 1 def find_initial_person(self): person = self.db.get_default_person() if not person: - the_ids = self.db.get_person_id_map().keys() + the_ids = self.db.get_person_keys() if the_ids: the_ids.sort() person = self.db.get_person(the_ids[0]) diff --git a/gramps2/src/plugins/Ancestors.py b/gramps2/src/plugins/Ancestors.py index 92b078ac0..cdbf8c784 100644 --- a/gramps2/src/plugins/Ancestors.py +++ b/gramps2/src/plugins/Ancestors.py @@ -305,7 +305,7 @@ class ComprehensiveAncestorsReport (Report.Report): person = self.database.find_person_from_id(person_id) name = self.person_name (person_id) if name: - photos = person.get_photo_list () + photos = person.get_media_list () bits = '' bits += self.short_occupation (person) @@ -342,9 +342,9 @@ class ComprehensiveAncestorsReport (Report.Report): if (suppress_children or (partner != from_family_father and partner != from_family_mother)): - for photo in partner.get_photo_list ()[:1]: + for photo in partner.get_media_list ()[:1]: if photo.ref.get_mime_type()[0:5] == "image": - spouse.append ((self.doc.add_photo, + spouse.append ((self.doc.add_media_object, [photo.ref.get_path (), 'right', 2, 2])) @@ -375,7 +375,7 @@ class ComprehensiveAncestorsReport (Report.Report): ret.append ((self.doc.start_cell, ["AR-Photo"])) for photo in photos[:1]: if photo.ref.get_mime_type()[0:5] == "image": - ret.append ((self.doc.add_photo, + ret.append ((self.doc.add_media_object, [photo.ref.get_path (), 'left', 2, 2])) ret.append ((self.doc.end_cell, [])) diff --git a/gramps2/src/plugins/Check.py b/gramps2/src/plugins/Check.py index b5995a24d..ade705d18 100644 --- a/gramps2/src/plugins/Check.py +++ b/gramps2/src/plugins/Check.py @@ -120,32 +120,32 @@ class CheckIntegrity: # File is lost => remove all references and the object itself mobj = ObjectMap[ObjectId] for p in self.db.get_family_id_map().values(): - nl = p.get_photo_list() + nl = p.get_media_list() for o in nl: if o.get_reference() == mobj: nl.remove(o) - p.set_photo_list(nl) + p.set_media_list(nl) for key in self.db.get_person_keys(): p = self.db.get_person(key) - nl = p.get_photo_list() + nl = p.get_media_list() for o in nl: if o.get_reference() == mobj: nl.remove(o) - p.set_photo_list(nl) + p.set_media_list(nl) for key in self.db.get_source_keys(): p = self.db.get_source(key) - nl = p.get_photo_list() + nl = p.get_media_list() for o in nl: if o.get_reference() == mobj: nl.remove(o) - p.set_photo_list(nl) + p.set_media_list(nl) for key in self.db.get_place_id_keys(): p = self.db.get_place_id(key) - nl = p.get_photo_list() + nl = p.get_media_list() for o in nl: if o.get_reference() == mobj: nl.remove(o) - p.set_photo_list(nl) + p.set_media_list(nl) self.removed_photo.append(ObjectMap[ObjectId]) self.db.remove_object(ObjectId) Utils.modified() diff --git a/gramps2/src/plugins/DetAncestralReport.py b/gramps2/src/plugins/DetAncestralReport.py index 19314a52f..de9b766fc 100644 --- a/gramps2/src/plugins/DetAncestralReport.py +++ b/gramps2/src/plugins/DetAncestralReport.py @@ -562,7 +562,7 @@ class DetAncestorReport(Report.Report): #-------------------------------------------------------------------- def insert_images(self, person): - photos = person.get_photo_list() + photos = person.get_media_list() paragraph_started = 0 for photo in photos : object = photo.get_reference() @@ -571,7 +571,7 @@ class DetAncestorReport(Report.Report): if not paragraph_started: self.doc.start_paragraph("DAR-Entry") paragraph_started = 1 - self.doc.add_photo(file,"row",4.0,4.0) + self.doc.add_media_object(file,"row",4.0,4.0) self.doc.end_paragraph() #-------------------------------------------------------------------- diff --git a/gramps2/src/plugins/DetDescendantReport.py b/gramps2/src/plugins/DetDescendantReport.py index 850ddd4a7..1424ad113 100644 --- a/gramps2/src/plugins/DetDescendantReport.py +++ b/gramps2/src/plugins/DetDescendantReport.py @@ -555,7 +555,7 @@ class DetDescendantReport(Report.Report): #-------------------------------------------------------------------- def insert_images(self, person): - photos = person.get_photo_list() + photos = person.get_media_list() paragraph_started = 0 for photo in photos : object = photo.get_reference() @@ -564,7 +564,7 @@ class DetDescendantReport(Report.Report): if not paragraph_started: self.doc.start_paragraph("DDR-Entry") paragraph_started = 1 - self.doc.add_photo(file,"row",4.0,4.0) + self.doc.add_media_object(file,"row",4.0,4.0) self.doc.end_paragraph() #-------------------------------------------------------------------- diff --git a/gramps2/src/plugins/IndivComplete.py b/gramps2/src/plugins/IndivComplete.py index 49e09bce4..c35e76b60 100644 --- a/gramps2/src/plugins/IndivComplete.py +++ b/gramps2/src/plugins/IndivComplete.py @@ -372,7 +372,7 @@ class IndivComplete(Report.Report): self.d.page_break() self.slist = [] - photo_list = self.person.get_photo_list() + media_list = self.person.get_media_list() name = self.person.get_primary_name().get_regular_name() self.d.start_paragraph("IDS-Title") self.d.write_text(_("Summary of %s") % name) @@ -381,12 +381,12 @@ class IndivComplete(Report.Report): self.d.start_paragraph("IDS-Normal") self.d.end_paragraph() - if len(photo_list) > 0: - object = photo_list[0].get_reference() + if len(media_list) > 0: + object = media_list[0].get_reference() if object.get_mime_type()[0:5] == "image": file = object.get_path() self.d.start_paragraph("IDS-Normal") - self.d.add_photo(file,"row",4.0,4.0) + self.d.add_media_object(file,"row",4.0,4.0) self.d.end_paragraph() self.d.start_table("one","IDS-IndTable") diff --git a/gramps2/src/plugins/IndivSummary.py b/gramps2/src/plugins/IndivSummary.py index c62d3e153..5f3fea810 100644 --- a/gramps2/src/plugins/IndivSummary.py +++ b/gramps2/src/plugins/IndivSummary.py @@ -209,7 +209,7 @@ class IndivSummary(Report.Report): if self.newpage: self.d.page_break() - photo_list = self.person.get_photo_list() + media_list = self.person.get_media_list() name = self.person.get_primary_name().get_regular_name() self.d.start_paragraph("IVS-Title") @@ -219,12 +219,12 @@ class IndivSummary(Report.Report): self.d.start_paragraph("IVS-Normal") self.d.end_paragraph() - if len(photo_list) > 0: - object = photo_list[0].get_reference() + if len(media_list) > 0: + object = media_list[0].get_reference() if object.get_mime_type()[0:5] == "image": file = object.get_path() self.d.start_paragraph("IVS-Normal") - self.d.add_photo(file,"row",4.0,4.0) + self.d.add_media_object(file,"row",4.0,4.0) self.d.end_paragraph() self.d.start_table("one","IVS-IndTable") diff --git a/gramps2/src/plugins/Makefile.in b/gramps2/src/plugins/Makefile.in index b08ccfec6..b3d14266a 100644 --- a/gramps2/src/plugins/Makefile.in +++ b/gramps2/src/plugins/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7.8 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, @@ -13,21 +13,45 @@ # PARTICULAR PURPOSE. @SET_MAKE@ +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 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 = : @@ -35,54 +59,28 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +EXEEXT = @EXEEXT@ +OBJEXT = @OBJEXT@ +PATH_SEPARATOR = @PATH_SEPARATOR@ + pkgdatadir = $(datadir)/@PACKAGE@/plugins -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BINSH = @BINSH@ CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EXEEXT = @EXEEXT@ GNOMEHELP = @GNOMEHELP@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ ICONV = @ICONV@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LANGUAGES = @LANGUAGES@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ MOFILES = @MOFILES@ MSGCONV = @MSGCONV@ MSGFMT = @MSGFMT@ -OBJEXT = @OBJEXT@ 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@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ @@ -92,44 +90,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@ 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@/plugins pkgpythondir = @pkgpythondir@/plugins -prefix = @prefix@ -program_transform_name = @program_transform_name@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ # This is the src/plugins level Makefile for Gramps # We could use GNU make's ':=' syntax for nice wildcard use, @@ -210,15 +183,14 @@ dist_pkgdata_DATA = $(GLADEFILES) GRAMPS_PY_MODPATH = "../:../docgen" subdir = src/plugins -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = DIST_SOURCES = py_compile = $(top_srcdir)/py-compile DATA = $(dist_pkgdata_DATA) -DIST_COMMON = $(dist_pkgdata_DATA) $(pkgpython_PYTHON) \ - $(srcdir)/Makefile.in Makefile.am +DIST_COMMON = $(dist_pkgdata_DATA) $(pkgpython_PYTHON) Makefile.am \ + Makefile.in all: all-am .SUFFIXES: @@ -233,12 +205,11 @@ install-pkgpythonPYTHON: $(pkgpython_PYTHON) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(pkgpythondir) @list='$(pkgpython_PYTHON)'; dlist=''; for p in $$list; do\ - if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \ - if test -f $$b$$p; then \ + if test -f $(srcdir)/$$p; then \ d=`echo "$$p" | sed -e 's,^.*/,,'`; \ dlist="$$dlist $$d"; \ - echo " $(pkgpythonPYTHON_INSTALL) $$b$$p $(DESTDIR)$(pkgpythondir)/$$d"; \ - $(pkgpythonPYTHON_INSTALL) $$b$$p $(DESTDIR)$(pkgpythondir)/$$d; \ + echo " $(pkgpythonPYTHON_INSTALL) $(srcdir)/$$p $(DESTDIR)$(pkgpythondir)/$$d"; \ + $(pkgpythonPYTHON_INSTALL) $(srcdir)/$$p $(DESTDIR)$(pkgpythondir)/$$d; \ else :; fi; \ done; \ PYTHON=$(PYTHON) $(py_compile) --basedir $(DESTDIR)$(pkgpythondir) $$dlist @@ -272,22 +243,13 @@ uninstall-dist_pkgdataDATA: tags: TAGS TAGS: -ctags: CTAGS -CTAGS: - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @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 \ @@ -313,6 +275,7 @@ all-am: Makefile $(DATA) installdirs: $(mkinstalldirs) $(DESTDIR)$(pkgpythondir) $(DESTDIR)$(pkgdatadir) + install: install-am install-exec: install-exec-am install-data: install-data-am @@ -332,7 +295,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -342,7 +305,7 @@ clean: clean-am clean-am: clean-generic mostlyclean-am distclean: distclean-am - -rm -f Makefile + distclean-am: clean-am distclean-generic dvi: dvi-am @@ -364,21 +327,13 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f Makefile + maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - uninstall-am: uninstall-dist_pkgdataDATA uninstall-info-am \ uninstall-pkgpythonPYTHON @@ -389,10 +344,9 @@ uninstall-am: uninstall-dist_pkgdataDATA uninstall-info-am \ install-info install-info-am install-man \ install-pkgpythonPYTHON install-strip installcheck \ installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am \ - uninstall-dist_pkgdataDATA uninstall-info-am \ - uninstall-pkgpythonPYTHON + maintainer-clean-generic mostlyclean mostlyclean-generic \ + uninstall uninstall-am uninstall-dist_pkgdataDATA \ + uninstall-info-am uninstall-pkgpythonPYTHON pycheck: diff --git a/gramps2/src/plugins/ReadGedcom.py b/gramps2/src/plugins/ReadGedcom.py index 8e77c3677..3f530db2f 100644 --- a/gramps2/src/plugins/ReadGedcom.py +++ b/gramps2/src/plugins/ReadGedcom.py @@ -443,7 +443,7 @@ class GedcomParser: self.source.set_note(note) if not self.source.get_title(): self.source.set_title("No title - ID %s" % self.source.get_id()) - self.db.build_source_display(self.source.get_id()) + self.db.commit_source(self.source) self.backup() return elif matches[1] == "TITL": @@ -471,7 +471,7 @@ class GedcomParser: else: note = "%s %s%s" % (matches[1],matches[2],d) elif matches[1] == "ABBR": - self.source.setAbbrev(matches[2] + self.parse_continue_data(level+1)) + self.source.set_abbreviation(matches[2] + self.parse_continue_data(level+1)) else: note = self.source.get_note() if note: @@ -497,16 +497,19 @@ class GedcomParser: mother.add_address(self.addr) for child in self.family.get_child_id_list(): child.add_address(self.addr) + self.db.commit_family(self.family) elif matches[2] == "INDI": if self.indi_count % UPDATE == 0 and self.window: self.update(self.people_obj,str(self.indi_count)) self.indi_count = self.indi_count + 1 id = matches[1] id = id[1:-1] + print id self.person = self.find_or_create_person(id) self.added[self.person.get_id()] = self.person self.parse_individual() self.db.build_person_display(self.person.get_id()) + self.db.commit_person(self.person) elif matches[2] in ["SUBM","SUBN","REPO"]: self.ignore_sub_junk(1) elif matches[1] in ["SUBM","SUBN","OBJE","_EVENT_DEFN"]: @@ -532,7 +535,7 @@ class GedcomParser: def find_or_create_person(self,id): if self.pmap.has_key(id): person = self.db.find_person_from_id(self.pmap[id]) - elif self.db.get_person_id_map().has_key(id): + elif self.db.has_person_id(id): person = RelLib.Person() self.pmap[id] = self.db.add_person(person) else: @@ -607,12 +610,12 @@ class GedcomParser: elif matches[1] == "HUSB": id = matches[2] person = self.find_or_create_person(id[1:-1]) - self.family.set_father_id(person) + self.family.set_father_id(person.get_id()) self.ignore_sub_junk(2) elif matches[1] == "WIFE": id = matches[2] person = self.find_or_create_person(id[1:-1]) - self.family.set_mother_id(person) + self.family.set_mother_id(person.get_id()) self.ignore_sub_junk(2) elif matches[1] == "SLGS": ord = RelLib.LdsOrd() @@ -626,18 +629,19 @@ class GedcomParser: mrel,frel = self.parse_ftw_relations(2) id = matches[2] child = self.find_or_create_person(id[1:-1]) - self.family.add_child_id(child) + self.family.add_child_id(child.get_id()) for f in child.get_parent_family_id_list(): - if f[0] == self.family: + if f[0] == self.family.get_id(): break else: if (mrel=="Birth" or mrel=="") and (frel=="Birth" or frel==""): - child.set_main_parent_family_id(self.family) + child.set_main_parent_family_id(self.family.get_id()) else: if child.get_main_parents_family_id() == self.family: child.set_main_parent_family_id(None) - child.add_parent_family_id(self.family,mrel,frel) + child.add_parent_family_id(self.family.get_id(),mrel,frel) + self.db.commit_person(child) elif matches[1] == "NCHI": a = RelLib.Attribute() a.set_type("Number of Children") @@ -664,8 +668,9 @@ class GedcomParser: event.set_name(matches[1]) if event.get_name() == "Marriage": self.family.set_relationship("Married") - self.family.add_event(event) + self.family.add_event_id(event.get_id()) self.parse_family_event(event,2) + self.db.add_event(event) def parse_note_base(self,matches,obj,level,old_note,task): note = old_note @@ -766,28 +771,30 @@ class GedcomParser: self.parse_ord(ord,2) elif matches[1] == "FAMS": family = self.db.find_family_with_map(matches[2],self.fmap) - self.person.add_family_id(family) + self.person.add_family_id(family.get_id()) if note == "": note = self.parse_optional_note(2) else: note = "%s\n\n%s" % (note,self.parse_optional_note(2)) + self.db.commit_family(family) elif matches[1] == "FAMC": type,note = self.parse_famc_type(2) family = self.db.find_family_with_map(matches[2],self.fmap) for f in self.person.get_parent_family_id_list(): - if f[0] == family: + if f[0] == family.get_id(): break else: if type == "" or type == "Birth": if self.person.get_main_parents_family_id() == None: - self.person.set_main_parent_family_id(family) + self.person.set_main_parent_family_id(family.get_id()) else: - self.person.add_parent_family_id(family,"Unknown","Unknown") + self.person.add_parent_family_id(family.get_id(),"Unknown","Unknown") else: - if self.person.get_main_parents_family_id() == family: + if self.person.get_main_parents_family_id() == family.get_id(): self.person.set_main_parent_family_id(None) - self.person.add_parent_family_id(family,type,type) + self.person.add_parent_family_id(family.get_id(),type,type) + self.db.commit_family(family) elif matches[1] == "RESI": addr = RelLib.Address() self.person.add_address(addr) @@ -804,33 +811,34 @@ class GedcomParser: self.person.add_address(addr) elif matches[1] == "BIRT": event = RelLib.Event() - if self.person.get_birth().get_date() != "" or \ - self.person.get_birth().get_place_id() != None: + if self.person.get_birth_id(): event.set_name("Alternate Birth") - self.person.add_event(event) + self.person.add_event_id(event.get_id()) else: event.set_name("Birth") - self.person.set_birth(event) + self.person.set_birth_id(event.get_id()) self.parse_person_event(event,2) + self.db.add_event(event) elif matches[1] == "ADOP": event = RelLib.Event() event.set_name("Adopted") - self.person.add_event(event) + self.person.add_event_id(event.get_id()) self.parse_adopt_event(event,2) + self.db.add_event(event) elif matches[1] == "DEAT": event = RelLib.Event() - if self.person.get_death().get_date() != "" or \ - self.person.get_death().get_place_id() != None: + if self.person.get_death_id(): event.set_name("Alternate Death") - self.person.add_event(event) + self.person.add_event_id(event.get_id()) else: event.set_name("Death") - self.person.set_death(event) + self.person.set_death_id(event.get_id()) self.parse_person_event(event,2) + self.db.add_event(event) elif matches[1] == "EVEN": event = RelLib.Event() if matches[2]: - event.setDescription(matches[2]) + event.set_description(matches[2]) self.parse_person_event(event,2) n = string.strip(event.get_name()) if n in self.attrs: @@ -839,7 +847,8 @@ class GedcomParser: attr.set_value(event.get_description()) self.person.add_attribute(attr) else: - self.person.add_event(event) + self.db.add_event(event) + self.person.add_event_id(event.get_id()) elif matches[1] == "SOUR": source_ref = self.handle_source(matches,2) self.person.get_primary_name().add_source_reference(source_ref) @@ -875,7 +884,8 @@ class GedcomParser: self.parse_person_event(event,2) if matches[2]: event.set_description(matches[2]) - self.person.add_event(event) + self.db.add_event(event) + self.person.add_event_id(event.get_id()) def parse_optional_note(self,level): note = "" @@ -955,14 +965,14 @@ class GedcomParser: self.warn(string.join(path,"\n\t\t")) self.warn('\n') else: - photo = RelLib.Photo() + photo = RelLib.MediaObject() photo.set_path(path) photo.set_description(title) photo.set_mime_type(Utils.get_mime_type(path)) self.db.add_object(photo) - oref = RelLib.ObjectRef() + oref = RelLib.MediaRef() oref.set_reference(photo) - self.person.add_photo(oref) + self.person.add_media_object(oref) def parse_family_object(self,level): form = "" @@ -993,14 +1003,15 @@ class GedcomParser: self.warn(string.join(path,"\n\t\t")) self.warn('\n') else: - photo = RelLib.Photo() + photo = RelLib.MediaObject() photo.set_path(path) photo.set_description(title) photo.set_mime_type(Utils.get_mime_type(path)) self.db.add_object(photo) - oref = RelLib.ObjectRef() + oref = RelLib.MediaRef() oref.set_reference(photo) - self.family.add_photo(photo) + self.family.add_media_object(photo) + self.db.commit_family(self.family) def parse_residence(self,address,level): note = "" @@ -1078,13 +1089,14 @@ class GedcomParser: try: val = matches[2] if self.placemap.has_key(val): - place = self.placemap[val] + place_id = self.placemap[val] else: place = RelLib.Place() place.set_title(matches[2]) self.db.add_place(place) - self.placemap[val] = place - ord.set_place_id(place) + place_id = place.get_id() + self.placemap[val] = place_id + ord.set_place_id(place_id) self.ignore_sub_junk(level+1) except NameError: pass @@ -1130,13 +1142,14 @@ class GedcomParser: self.ignore_sub_junk(level+1) else: if self.placemap.has_key(val): - place = self.placemap[val] + place_id = self.placemap[val] else: place = RelLib.Place() place.set_title(matches[2]) self.db.add_place(place) - self.placemap[val] = place - event.set_place_id(place) + place_id = place.get_id() + self.placemap[val] = place_id + event.set_place_id(place_id) self.ignore_sub_junk(level+1) elif matches[1] == "CAUS": info = matches[2] + self.parse_continue_data(level+1) @@ -1179,19 +1192,20 @@ class GedcomParser: elif matches[1] == "FAMC": family = self.db.find_family_with_map(matches[2],self.fmap) mrel,frel = self.parse_adopt_famc(level+1); - if self.person.get_main_parents_family_id() == family: + if self.person.get_main_parents_family_id() == family.get_id(): self.person.set_main_parent_family_id(None) - self.person.add_parent_family_id(family,mrel,frel) + self.person.add_parent_family_id(family.get_id(),mrel,frel) elif matches[1] == "PLAC": val = matches[2] if self.placemap.has_key(val): - place = self.placemap[val] + place_id = self.placemap[val] else: place = RelLib.Place() place.set_title(matches[2]) self.db.add_place(place) - self.placemap[val] = place - event.set_place_id(place) + place_id = place.get_id() + self.placemap[val] = place_id + event.set_place_id(place_id) self.ignore_sub_junk(level+1) elif matches[1] == "TYPE": # eventually do something intelligent here @@ -1312,13 +1326,14 @@ class GedcomParser: elif matches[1] == "PLAC": val = matches[2] if self.placemap.has_key(val): - place = self.placemap[val] + place_id = self.placemap[val] else: place = RelLib.Place() place.set_title(matches[2]) self.db.add_place(place) - self.placemap[val] = place - event.set_place_id(place) + place_id = place.get_id() + self.placemap[val] = place_id + event.set_place_id(place_id) self.ignore_sub_junk(level+1) elif matches[1] == 'OFFI': if note == "": @@ -1680,21 +1695,20 @@ class GedcomParser: self.localref = self.localref + 1 ref = "gsr%d" % self.localref s = self.db.find_source(ref,self.smap) - source_ref.set_base_id(s) + source_ref.set_base_id(s.get_id()) s.set_title('Imported Source #%d' % self.localref) s.set_note(matches[2] + self.parse_continue_data(level)) self.db.build_source_display(s.get_id()) self.ignore_sub_junk(level+1) else: - source_ref.set_base_id(self.db.find_source(matches[2],self.smap)) + source_ref.set_base_id(self.db.find_source(matches[2],self.smap).get_id()) self.parse_source_reference(source_ref,level) return source_ref def resolve_refns(self): prefix = self.db.iprefix index = 0 - new_pmax = self.db.pmapIndex - pmap = self.db.get_person_id_map() + new_pmax = self.db.pmap_index for pid, person in self.added.items(): index = index + 1 if self.refn.has_key(pid): @@ -1703,12 +1717,12 @@ class GedcomParser: new_pmax = max(new_pmax,val) # new ID is not used - if not pmap.has_key(new_key): + if not self.db.has_person_id(new_key): self.db.remove_person_id(person.get_id()) person.set_id(new_key) self.db.add_person_as(person) else: - tp = pmap[new_key] + tp = self.db.find_person_from_id(new_key) # same person, just change it if person == tp: self.db.remove_person_id(person.get_id()) @@ -1718,7 +1732,7 @@ class GedcomParser: else: pass - self.db.pmapIndex = new_pmax + self.db.pmap_index = new_pmax global file_top diff --git a/gramps2/src/plugins/SimpleBookTitle.py b/gramps2/src/plugins/SimpleBookTitle.py index 57197d4fb..1a1507b32 100644 --- a/gramps2/src/plugins/SimpleBookTitle.py +++ b/gramps2/src/plugins/SimpleBookTitle.py @@ -96,7 +96,7 @@ class SimpleBookTitle(Report.Report): image_size = min( 0.8 * self.doc.get_usable_width(), 0.7 * self.doc.get_usable_height() ) - self.doc.add_photo(name,'center',image_size,image_size) + self.doc.add_media_object(name,'center',image_size,image_size) self.doc.start_paragraph('SBT-Footer') self.doc.write_text(self.footer_string) diff --git a/gramps2/src/plugins/Summary.py b/gramps2/src/plugins/Summary.py index 59857299f..0dace10b8 100644 --- a/gramps2/src/plugins/Summary.py +++ b/gramps2/src/plugins/Summary.py @@ -75,7 +75,7 @@ def build_report(database,person): notfound.append(photo.get_path()) for person in personList: - length = len(person.get_photo_list()) + length = len(person.get_media_list()) if length > 0: with_photos = with_photos + 1 total_photos = total_photos + length diff --git a/gramps2/src/plugins/WebPage.py b/gramps2/src/plugins/WebPage.py index ad25e33cc..0d3d9702b 100644 --- a/gramps2/src/plugins/WebPage.py +++ b/gramps2/src/plugins/WebPage.py @@ -292,7 +292,7 @@ class IndividualPage: filebase = "%s.%s" % (self.person.get_id(),self.ext) self.doc.open("%s/%s" % (self.dir,filebase)) - photo_list = self.person.get_photo_list() + media_list = self.person.get_media_list() name_obj = self.person.get_primary_name() name = name_obj.get_regular_name() @@ -311,13 +311,13 @@ class IndividualPage: # make sure that the media object is an image. If so, insert it # into the document. - if self.photos and len(photo_list) > 0: - object = photo_list[0].get_reference() + if self.photos and len(media_list) > 0: + object = media_list[0].get_reference() if object.get_mime_type()[0:5] == "image": file = object.get_path() if os.path.isfile(file): self.doc.start_paragraph("Data") - self.doc.add_photo(file,"row",4.0,4.0) + self.doc.add_media_object(file,"row",4.0,4.0) self.doc.end_paragraph() # Start the first table, which consists of basic information, including @@ -394,7 +394,7 @@ class IndividualPage: my_list = [] index = 0 - for object in self.person.get_photo_list(): + for object in self.person.get_media_list(): if object.get_reference().get_mime_type()[0:5] == "image": if object.get_privacy() == 0 and index != 0: my_list.append(object) @@ -439,7 +439,7 @@ class IndividualPage: self.doc.start_link("%s/%s" % (self.image_dir,base)) else: self.doc.start_link("%s" % base) - self.doc.add_photo(src,"row",1.5,1.5) + self.doc.add_media_object(src,"row",1.5,1.5) self.doc.end_link() self.doc.end_paragraph() diff --git a/gramps2/src/plugins/WriteCD.py b/gramps2/src/plugins/WriteCD.py index a93f46cbc..e74b33a9e 100644 --- a/gramps2/src/plugins/WriteCD.py +++ b/gramps2/src/plugins/WriteCD.py @@ -183,32 +183,32 @@ class PackageWriter: # File is lost => remove all references and the object itself mobj = self.db.get_object(self.object_id) for p in self.db.get_family_id_map().values(): - nl = p.get_photo_list() + nl = p.get_media_list() for o in nl: if o.get_reference() == mobj: nl.remove(o) - p.set_photo_list(nl) + p.set_media_list(nl) for key in self.db.get_person_keys(): p = self.db.get_person(key) - nl = p.get_photo_list() + nl = p.get_media_list() for o in nl: if o.get_reference() == mobj: nl.remove(o) - p.set_photo_list(nl) + p.set_media_list(nl) for key in self.db.get_source_keys(): p = self.db.get_source(key) - nl = p.get_photo_list() + nl = p.get_media_list() for o in nl: if o.get_reference() == mobj: nl.remove(o) - p.set_photo_list(nl) + p.set_media_list(nl) for key in self.db.get_place_id_keys(): p = self.db.get_place_id(key) - nl = p.get_photo_list() + nl = p.get_media_list() for o in nl: if o.get_reference() == mobj: nl.remove(o) - p.set_photo_list(nl) + p.set_media_list(nl) self.db.remove_object(self.object_id) Utils.modified() diff --git a/gramps2/src/plugins/WriteGedcom.py b/gramps2/src/plugins/WriteGedcom.py index a073cba76..3dc1001af 100644 --- a/gramps2/src/plugins/WriteGedcom.py +++ b/gramps2/src/plugins/WriteGedcom.py @@ -945,7 +945,7 @@ class GedcomWriter: self.write_source_ref(2,srcref) if self.images: - photos = person.get_photo_list () + photos = person.get_media_list () else: photos = [] diff --git a/gramps2/src/plugins/WritePkg.py b/gramps2/src/plugins/WritePkg.py index cde9982b5..d5b9ea054 100644 --- a/gramps2/src/plugins/WritePkg.py +++ b/gramps2/src/plugins/WritePkg.py @@ -110,32 +110,32 @@ class PackageWriter: # File is lost => remove all references and the object itself mobj = ObjectMap[ObjectId] for p in self.db.get_family_id_map().values(): - nl = p.get_photo_list() + nl = p.get_media_list() for o in nl: if o.get_reference() == mobj: nl.remove(o) - p.set_photo_list(nl) + p.set_media_list(nl) for key in self.db.get_person_keys(): p = self.db.get_person(key) - nl = p.get_photo_list() + nl = p.get_media_list() for o in nl: if o.get_reference() == mobj: nl.remove(o) - p.set_photo_list(nl) + p.set_media_list(nl) for key in self.db.get_source_keys(): p = self.db.get_source(key) - nl = p.get_photo_list() + nl = p.get_media_list() for o in nl: if o.get_reference() == mobj: nl.remove(o) - p.set_photo_list(nl) + p.set_media_list(nl) for key in self.db.get_place_id_keys(): p = self.db.get_place_id(key) - nl = p.get_photo_list() + nl = p.get_media_list() for o in nl: if o.get_reference() == mobj: nl.remove(o) - p.set_photo_list(nl) + p.set_media_list(nl) self.db.remove_object(ObjectId) Utils.modified() diff --git a/gramps2/src/po/Makefile.in b/gramps2/src/po/Makefile.in index 5262ccc48..63b34d4ff 100644 --- a/gramps2/src/po/Makefile.in +++ b/gramps2/src/po/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7.8 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, @@ -13,75 +13,73 @@ # PARTICULAR PURPOSE. @SET_MAKE@ +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@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EXEEXT = @EXEEXT@ GNOMEHELP = @GNOMEHELP@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ ICONV = @ICONV@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LANGUAGES = @LANGUAGES@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ MOFILES = @MOFILES@ MSGCONV = @MSGCONV@ MSGFMT = @MSGFMT@ -OBJEXT = @OBJEXT@ 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@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ @@ -91,43 +89,18 @@ 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@ 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@ # This is the src/po level Makefile configuration EXTRA_DIST = $(POFILES) template.po @@ -135,11 +108,10 @@ CLEANFILES = $(MOFILES) SUFFIXES = .po .mo subdir = src/po -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = DIST_SOURCES = -DIST_COMMON = $(srcdir)/Makefile.in Makefile.am +DIST_COMMON = Makefile.am Makefile.in all: all-am .SUFFIXES: @@ -153,22 +125,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) - @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 \ @@ -193,6 +156,7 @@ check: check-am all-am: Makefile all-local installdirs: + install: install-am install-exec: install-exec-am install-data: install-data-am @@ -213,7 +177,7 @@ clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -223,7 +187,7 @@ clean: clean-am clean-am: clean-generic mostlyclean-am distclean: distclean-am - -rm -f Makefile + distclean-am: clean-am distclean-generic dvi: dvi-am @@ -245,21 +209,13 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f Makefile + maintainer-clean-am: distclean-am maintainer-clean-generic 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 all-local check check-am clean clean-generic \ @@ -268,9 +224,8 @@ uninstall-am: uninstall-info-am uninstall-local install-data-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 + maintainer-clean-generic mostlyclean mostlyclean-generic \ + uninstall uninstall-am uninstall-info-am uninstall-local all-local: $(MOFILES)