From 0113bb454a31d8c1550ef3f541cd091dc6238753 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Sat, 3 Feb 2007 22:41:00 +0000 Subject: [PATCH] 2007-02-03 Don Allingham * configure.in: update version, process new Makefile.am files * src/GrampsDb/Makefile.am: update * src/Makefile.am: update svn: r8040 --- ChangeLog | 5 +++++ configure.in | 5 ++++- src/GrampsDb/Makefile.am | 3 --- src/Makefile.am | 8 +++----- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 822686885..d53612596 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-02-03 Don Allingham + * configure.in: update version, process new Makefile.am files + * src/GrampsDb/Makefile.am: update + * src/Makefile.am: update + 2007-01-26 Richard Taylor * src/GrampsDb/Makefile.am: remove files * src/GrampsDb/_GrampsDbConst.py: add license diff --git a/configure.in b/configure.in index e809bb336..f4df3c67a 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script. dnl May need to run automake && aclocal first AC_PREREQ(2.57) -AC_INIT(gramps, 2.2.7, [gramps-bugs@lists.sourceforge.net]) +AC_INIT(gramps, 2.3.0, [gramps-bugs@lists.sourceforge.net]) AC_CONFIG_SRCDIR(configure.in) AM_INIT_AUTOMAKE(1.6.3) @@ -222,6 +222,9 @@ src/Filters/Rules/MediaObject/Makefile src/Filters/Rules/Repository/Makefile src/Filters/SideBar/Makefile src/DataViews/Makefile +src/BasicUtils/Makefile +src/GrampsDbUtils/Makefile +src/GrampsLocale/Makefile src/PluginUtils/Makefile src/ReportBase/Makefile src/plugins/Makefile diff --git a/src/GrampsDb/Makefile.am b/src/GrampsDb/Makefile.am index 7c811aa7c..7d9aa7a9a 100644 --- a/src/GrampsDb/Makefile.am +++ b/src/GrampsDb/Makefile.am @@ -17,14 +17,11 @@ pkgdata_PYTHON = \ _GrampsXMLDB.py\ _GrampsDbConst.py\ __init__.py - pkgpyexecdir = @pkgpyexecdir@/GrampsDb pkgpythondir = @pkgpythondir@/GrampsDb -dist_pkgdata_DATA = - # Clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo diff --git a/src/Makefile.am b/src/Makefile.am index 752e3a616..7c433fdf8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,14 +2,15 @@ # $Id$ SUBDIRS = \ + BasicUtils \ Config \ + DateHandler \ DataViews \ Editors \ Filters \ FilterEditor \ GrampsDb \ GrampsDbUtils \ - BasicUtils \ GrampsLocale \ Merge \ DisplayTabs \ @@ -19,7 +20,6 @@ SUBDIRS = \ Selectors \ RelLib \ data \ - DateHandler \ PluginUtils \ ReportBase \ glade \ @@ -49,7 +49,6 @@ gdir_PYTHON = \ FontScale.py\ GrampsCfg.py\ GrampsDisplay.py\ - GrampsLocale.py\ gramps_main.py\ gramps.py\ GrampsWidgets.py\ @@ -77,14 +76,13 @@ gdir_PYTHON = \ Utils.py\ ViewManager.py\ UndoHistory.py\ - BasicUtils.py\ PlaceUtils.py # Clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo # Which modules to document -docmodules = RelLib DateHandler GrampsDb Filters ReportBase +docmodules = RelLib DateHandler GrampsDb Filters ReportBase GrampsDbUtils pycheck: for d in $(SUBDIRS) ; do \