21 files changed, 387 insertions, 117 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2ecb7b9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,11 @@
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache
+config.log
+config.status
+configure
+install-sh
+missing
+py-compile
+aclocal.m4
diff --git a/Makefile b/Makefile
deleted file mode 100644
index e9533e6..0000000
--- a/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-export PYTHON=python2.4
-export PROJECTNAME=olpc.datastore
-
-CURRENT_VERSION=`shtool version -l python src/olpc/datastore/__version__.py`
-
-all: build test
-
-build: 
-	@${PYTHON} setup.py build
-
-test: build
-	@${MAKE} -C tests test
-
-doc: 
-	@${MAKE} -C docs all
-
-clean: 
-	@find . -name "*.pyc" -exec rm {} \;
-	@find . -name "*~" -exec rm {} \;
-	@find src -name "*.c" -exec rm {} \;
-	@find src -name "callgrind.out.*" -exec rm {} \;	
-	@find src -name "core" -type f -exec rm {} \;	
-	@rm -rf build	
-	@${MAKE} -C docs clean
-
-tags:
-	@ctags -e -R -o TAGS
-
-version:
-	@echo Incrementing version level for package
-	@shtool version -l python -n ${PROJECTNAME} -d long -i l __version__.py
-
-install: build
-	@${PYTHON} setup.py install
-
-develop: build
-	@${PYTHON} setup.py develop
-
-release:
-	@$(PYTHON) setup.py sdist
-	@$(PYTHON) setup.py bdist_egg
-	@echo Release ready, check dist/
-
-upload:
-	@$(PYTHON) setup.py sdist upload
-	@$(PYTHON) setup.py bdist_egg upload
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..d5c672f
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = bin etc src
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..9bd6fd0
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+autoreconf -i
+./configure "$@"
diff --git a/bin/Makefile.am b/bin/Makefile.am
new file mode 100644
index 0000000..e36e3cc
--- /dev/null
+++ b/bin/Makefile.am
@@ -0,0 +1 @@
+bin_SCRIPTS = datastore-service
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..44e2ed3
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,18 @@
+AC_INIT([sugar-datastore],[0.2.1],[],[sugar-datastore])
+
+AC_PREREQ([2.59])
+
+AC_CONFIG_SRCDIR([configure.ac])
+
+AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip])
+
+AM_PATH_PYTHON
+
+AC_OUTPUT([
+Makefile
+bin/Makefile
+etc/Makefile
+src/Makefile
+src/olpc/Makefile
+src/olpc/datastore/Makefile
+])
diff --git a/etc/Makefile.am b/etc/Makefile.am
new file mode 100644
index 0000000..021af74
--- /dev/null
+++ b/etc/Makefile.am
@@ -0,0 +1,10 @@
+servicedir = $(datadir)/dbus-1/services
+service_in_files = org.laptop.Sugar.Datastore.in
+service_DATA = $(service_in_files:.service.in=.service)
+
+$(service_DATA): $(service_in_files) Makefile
+	@sed -e "s|\@bindir\@|$(bindir)|" $< > $@
+
+DISTCLEANFILES = $(service_DATA)
+
+EXTRA_DIST = $(service_in_files)
diff --git a/etc/org.laptop.Sugar.Datastore.in b/etc/org.laptop.Sugar.Datastore.in
new file mode 100644
index 0000000..94d8173
--- /dev/null
+++ b/etc/org.laptop.Sugar.Datastore.in
@@ -0,0 +1,323 @@
+# Makefile.in generated by automake 1.10 from Makefile.am.
+# etc/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+pkgdatadir = $(datadir)/sugar-datastore
+pkglibdir = $(libdir)/sugar-datastore
+pkgincludedir = $(includedir)/sugar-datastore
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = etc
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(servicedir)"
+serviceDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(service_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = ${SHELL} /home/marco/sugar-jhbuild/source/datastore/missing --run aclocal-1.10
+AMTAR = ${SHELL} /home/marco/sugar-jhbuild/source/datastore/missing --run tar
+AUTOCONF = ${SHELL} /home/marco/sugar-jhbuild/source/datastore/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/marco/sugar-jhbuild/source/datastore/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/marco/sugar-jhbuild/source/datastore/missing --run automake-1.10
+AWK = gawk
+CYGPATH_W = echo
+DEFS = -DPACKAGE_NAME=\"sugar-datastore\" -DPACKAGE_TARNAME=\"sugar-datastore\" -DPACKAGE_VERSION=\"0.2.1\" -DPACKAGE_STRING=\"sugar-datastore\ 0.2.1\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE=\"sugar-datastore\" -DVERSION=\"0.2.1\"
+ECHO_C = 
+ECHO_N = -n
+ECHO_T = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+LIBOBJS = 
+LIBS = 
+LTLIBOBJS = 
+MAKEINFO = ${SHELL} /home/marco/sugar-jhbuild/source/datastore/missing --run makeinfo
+MKDIR_P = /bin/mkdir -p
+PACKAGE = sugar-datastore
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = sugar-datastore
+PACKAGE_STRING = sugar-datastore 0.2.1
+PACKAGE_TARNAME = sugar-datastore
+PACKAGE_VERSION = 0.2.1
+PATH_SEPARATOR = :
+PYTHON = /home/marco/sugar-jhbuild/build/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.4
+SET_MAKE = 
+SHELL = /bin/sh
+STRIP = 
+VERSION = 0.2.1
+abs_builddir = /home/marco/sugar-jhbuild/source/datastore/etc
+abs_srcdir = /home/marco/sugar-jhbuild/source/datastore/etc
+abs_top_builddir = /home/marco/sugar-jhbuild/source/datastore
+abs_top_srcdir = /home/marco/sugar-jhbuild/source/datastore
+am__leading_dot = .
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+bindir = ${exec_prefix}/bin
+build_alias = 
+builddir = .
+datadir = ${datarootdir}
+datarootdir = ${prefix}/share
+docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
+dvidir = ${docdir}
+exec_prefix = ${prefix}
+host_alias = 
+htmldir = ${docdir}
+includedir = ${prefix}/include
+infodir = ${datarootdir}/info
+install_sh = $(SHELL) /home/marco/sugar-jhbuild/source/datastore/install-sh
+libdir = ${exec_prefix}/lib
+libexecdir = ${exec_prefix}/libexec
+localedir = ${datarootdir}/locale
+localstatedir = ${prefix}/var
+mandir = ${datarootdir}/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pkgpyexecdir = ${pyexecdir}/sugar-datastore
+pkgpythondir = ${pythondir}/sugar-datastore
+prefix = /home/marco/sugar-jhbuild/build
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.4/site-packages
+pythondir = ${prefix}/lib/python2.4/site-packages
+sbindir = ${exec_prefix}/sbin
+sharedstatedir = ${prefix}/com
+srcdir = .
+sysconfdir = ${prefix}/etc
+target_alias = 
+top_builddir = ..
+top_srcdir = ..
+servicedir = $(datadir)/dbus-1/services
+service_in_files = org.laptop.Sugar.Datastore.in
+service_DATA = $(service_in_files:.service.in=.service)
+DISTCLEANFILES = $(service_DATA)
+EXTRA_DIST = $(service_in_files)
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  etc/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  etc/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-serviceDATA: $(service_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)"
+	@list='$(service_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(serviceDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicedir)/$$f'"; \
+	  $(serviceDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicedir)/$$f"; \
+	done
+
+uninstall-serviceDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(service_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(servicedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(servicedir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(servicedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-serviceDATA
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+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-serviceDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-serviceDATA install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+	uninstall-am uninstall-serviceDATA
+
+
+$(service_DATA): $(service_in_files) Makefile
+	@sed -e "s|\@bindir\@|$(bindir)|" $< > $@
+# 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.
+.NOEXPORT:
diff --git a/etc/org.laptop.sugar.DataStore.service b/etc/org.laptop.sugar.DataStore.service
deleted file mode 100644
index 6ca1eba..0000000
--- a/etc/org.laptop.sugar.DataStore.service
+++ /dev/null
@@ -1,4 +0,0 @@
-[D-BUS Service]
-Name = org.laptop.sugar.DataStore
-Exec = /home/bcsaller/Projects/datastore/bin/datastore-service
-
diff --git a/etc/org.laptop.sugar.DataStore.service.in b/etc/org.laptop.sugar.DataStore.service.in
new file mode 100644
index 0000000..1b5b270
--- /dev/null
+++ b/etc/org.laptop.sugar.DataStore.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name = org.laptop.sugar.DataStore
+Exec = @bindir@/datastore-service
diff --git a/setup.py b/setup.py
deleted file mode 100644
index 032e395..0000000
--- a/setup.py
+++ /dev/null
@@ -1,31 +0,0 @@
-from setuptools import setup, find_packages
-
-#import sys, os
-#sys.path.insert(0, os.path.join(os.path.dirname(__file__),'src')) # for version
-#from olpc.datastore.__version__ import version
-
-DEPENDS = ['sqlalchemy >= 0.3.6', ]
-
-
-setup(
-    name="sugar-datastore",
-    version="0.2.0",
-    packages=find_packages('src', exclude=["*.tests"]),
-    package_dir= {'':'src'},
-    namespace_packages=['olpc'],
-    package_data = {
-    '': ['*.txt', '*.db', '*.png', '*.svg'],
-    },
-    data_files = [
-        ('/usr/share/dbus-1/services', ['etc/org.laptop.sugar.DataStore.service']),
-    ],
-    install_requires = DEPENDS,
-    zip_safe=True,
-    author='Benjamin Saller',
-    author_email='bcsaller@objectrealms.net',
-    description="""\
-    DataStore used for the OLPC project (http://laptop.org)
-    """,
-    license='GPL',
-    keywords="datastore journal repository",
-    )
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..2e5348c
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = olpc
diff --git a/src/olpc.datastore.egg-info/PKG-INFO b/src/olpc.datastore.egg-info/PKG-INFO
deleted file mode 100644
index 876d66d..0000000
--- a/src/olpc.datastore.egg-info/PKG-INFO
+++ /dev/null
@@ -1,12 +0,0 @@
-Metadata-Version: 1.0
-Name: olpc.datastore
-Version: 0.2.0
-Summary:     DataStore used for the OLPC project (http://laptop.org)
-    
-Home-page: UNKNOWN
-Author: Benjamin Saller
-Author-email: bcsaller@objectrealms.net
-License: GPL
-Description: UNKNOWN
-Keywords: datastore journal repository
-Platform: UNKNOWN
diff --git a/src/olpc.datastore.egg-info/SOURCES.txt b/src/olpc.datastore.egg-info/SOURCES.txt
deleted file mode 100644
index d423d93..0000000
--- a/src/olpc.datastore.egg-info/SOURCES.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-README.txt
-setup.py
-src/olpc/__init__.py
-src/olpc.datastore.egg-info/PKG-INFO
-src/olpc.datastore.egg-info/SOURCES.txt
-src/olpc.datastore.egg-info/dependency_links.txt
-src/olpc.datastore.egg-info/namespace_packages.txt
-src/olpc.datastore.egg-info/requires.txt
-src/olpc.datastore.egg-info/top_level.txt
-src/olpc.datastore.egg-info/zip-safe
-src/olpc/datastore/__init__.py
-src/olpc/datastore/__version__.py
-src/olpc/datastore/backingstore.py
-src/olpc/datastore/converter.py
-src/olpc/datastore/datastore.py
-src/olpc/datastore/dbus_helpers.py
-src/olpc/datastore/model.py
-src/olpc/datastore/query.py
-src/olpc/datastore/utils.py
diff --git a/src/olpc.datastore.egg-info/dependency_links.txt b/src/olpc.datastore.egg-info/dependency_links.txt
deleted file mode 100644
index 8b13789..0000000
--- a/src/olpc.datastore.egg-info/dependency_links.txt
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/olpc.datastore.egg-info/namespace_packages.txt b/src/olpc.datastore.egg-info/namespace_packages.txt
deleted file mode 100644
index c7579d3..0000000
--- a/src/olpc.datastore.egg-info/namespace_packages.txt
+++ /dev/null
@@ -1 +0,0 @@
-olpc
diff --git a/src/olpc.datastore.egg-info/requires.txt b/src/olpc.datastore.egg-info/requires.txt
deleted file mode 100644
index 6e21252..0000000
--- a/src/olpc.datastore.egg-info/requires.txt
+++ /dev/null
@@ -1 +0,0 @@
-sqlalchemy >= 0.3.6
-\ No newline at end of file
diff --git a/src/olpc.datastore.egg-info/top_level.txt b/src/olpc.datastore.egg-info/top_level.txt
deleted file mode 100644
index c7579d3..0000000
--- a/src/olpc.datastore.egg-info/top_level.txt
+++ /dev/null
@@ -1 +0,0 @@
-olpc
diff --git a/src/olpc.datastore.egg-info/zip-safe b/src/olpc.datastore.egg-info/zip-safe
deleted file mode 100644
index 8b13789..0000000
--- a/src/olpc.datastore.egg-info/zip-safe
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/olpc/Makefile.am b/src/olpc/Makefile.am
new file mode 100644
index 0000000..9b2ae65
--- /dev/null
+++ b/src/olpc/Makefile.am
@@ -0,0 +1,5 @@
+SUBDIRS = datastore
+
+datastoredir = $(pythondir)/olpc
+datastore_PYTHON =	\
+	__init__.py
diff --git a/src/olpc/datastore/Makefile.am b/src/olpc/datastore/Makefile.am
new file mode 100644
index 0000000..2381a1e
--- /dev/null
+++ b/src/olpc/datastore/Makefile.am
@@ -0,0 +1,11 @@
+datastoredir = $(pythondir)/olpc/datastore
+datastore_PYTHON = 		\
+	__init__.py		\
+	backingstore.py 	\
+	converter.py 		\
+	datastore.py		\
+	dbus_helpers.py 	\
+	model.py		\
+	query.py		\
+	utils.py		\
+	__version__.py