Merge the keyfile settings backend.

[platform/upstream/glib.git] / gio / Makefile.am

diff --git a/gio/Makefile.am b/gio/Makefile.am
index 1fe7d07..1f3ff10 100644 (file)
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -79,21 +79,27 @@ gio-marshal.c: gio-marshal.h gio-marshal.list
        $(glib_genmarshal) --prefix=_gio_marshal $(srcdir)/gio-marshal.list --body --internal) > $@.tmp && \
          mv $@.tmp $@
 
+settings_headers = \
+       gsettingsbackend.h              \
+       gsettings.h
+
 settings_sources = \
-       gsettingsbackendinternal.h      \
+       gvdb/gvdb-format.h              \
+       gvdb/gvdb-reader.h              \
+       gvdb/gvdb-reader.c              \
        gdelayedsettingsbackend.h       \
-       gdelayedsettingsbackend.                \
+       gdelayedsettingsbackend.c       \
+       gkeyfilesettingsbackend.h       \
+       gkeyfilesettingsbackend.c       \
        gnullsettingsbackend.h          \
        gnullsettingsbackend.c          \
+       gsettingsbackendinternal.h      \
        gsettingsbackend.c              \
-       gvdb/gvdb-format.h              \
-       gvdb/gvdb-reader.h              \
-       gvdb/gvdb-reader.c              \
        gsettingsschema.h               \
-       gsettingsschema.c
-
-settings_headers = \
-       gsettingsbackend.h
+       gsettingsschema.c               \
+       gsettings-mapping.h             \
+       gsettings-mapping.c             \
+       gsettings.c
 
 local_sources = \
        glocaldirectorymonitor.c        \
@@ -428,7 +434,7 @@ gio_headers =                       \
        gvolumemonitor.h        \
        gzlibcompressor.h       \
        gzlibdecompressor.h     \
-       $(settings_headers)     \
+       $(settings_headers)     \
        $(NULL)
 
 gioincludedir=$(includedir)/glib-2.0/gio/
@@ -489,9 +495,9 @@ gio_querymodules_LDADD       = \
 
 gschema_compile_LDADD = $(top_builddir)/glib/libglib-2.0.la
 gschema_compile_SOURCES = \
-       gvdb/gvdb-format.h      \
-       gvdb/gvdb-builder.h     \
-       gvdb/gvdb-builder.c     \
+       gvdb/gvdb-format.h              \
+       gvdb/gvdb-builder.h             \
+       gvdb/gvdb-builder.c             \
        gschema-compile.c
 
 dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gio.vcproj