Merge the keyfile settings backend.

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

diff --git a/gio/Makefile.am b/gio/Makefile.am
index 580db1a..1f3ff10 100644 (file)
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -79,6 +79,28 @@ 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 = \
+       gvdb/gvdb-format.h              \
+       gvdb/gvdb-reader.h              \
+       gvdb/gvdb-reader.c              \
+       gdelayedsettingsbackend.h       \
+       gdelayedsettingsbackend.c       \
+       gkeyfilesettingsbackend.h       \
+       gkeyfilesettingsbackend.c       \
+       gnullsettingsbackend.h          \
+       gnullsettingsbackend.c          \
+       gsettingsbackendinternal.h      \
+       gsettingsbackend.c              \
+       gsettingsschema.h               \
+       gsettingsschema.c               \
+       gsettings-mapping.h             \
+       gsettings-mapping.c             \
+       gsettings.c
+
 local_sources = \
        glocaldirectorymonitor.c        \
        glocaldirectorymonitor.h        \
@@ -272,7 +294,6 @@ libgio_2_0_la_SOURCES =             \
        gthreadedresolver.h     \
        gunionvolumemonitor.c   \
        gunionvolumemonitor.h   \
-       gutf8inputstream.c      \
        gvfs.c                  \
        gvolume.c               \
        gvolumemonitor.c        \
@@ -286,6 +307,7 @@ libgio_2_0_la_SOURCES =             \
        $(appinfo_sources)      \
        $(unix_sources)         \
        $(win32_sources)        \
+       $(settings_sources)     \
        $(local_sources)        \
        $(marshal_sources)      \
        $(NULL)
@@ -407,12 +429,12 @@ gio_headers =                     \
        gtcpconnection.h        \
        gthreadedsocketservice.h\
        gthemedicon.h           \
-       gutf8inputstream.h      \
        gvfs.h                  \
        gvolume.h               \
        gvolumemonitor.h        \
        gzlibcompressor.h       \
        gzlibdecompressor.h     \
+       $(settings_headers)     \
        $(NULL)
 
 gioincludedir=$(includedir)/glib-2.0/gio/
@@ -462,7 +484,7 @@ gioenumtypes.c: $(gio_headers) gioenumtypes.c.template
 gio-2.0.lib: libgio-2.0.la gio.def
        lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgio-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:gio.def -out:$@
 
-bin_PROGRAMS = gio-querymodules
+bin_PROGRAMS = gio-querymodules gschema-compile
 gio_querymodules_SOURCES = gio-querymodules.c
 gio_querymodules_LDADD  = \
        $(top_builddir)/glib/libglib-2.0.la             \
@@ -471,12 +493,28 @@ gio_querymodules_LDADD     = \
        libgio-2.0.la                                   \
        $(NULL)
 
-dist-hook: $(BUILT_EXTRA_DIST)
+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             \
+       gschema-compile.c
+
+dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gio.vcproj
        files='$(BUILT_EXTRA_DIST)'; \
        for f in $$files; do \
          if test -f $$f; then d=.; else d=$(srcdir); fi; \
          cp $$d/$$f $(distdir) || exit 1; done
 
+../build/win32/vs9/gio.vcproj: $(top_srcdir)/build/win32/vs9/gio.vcprojin
+       for F in $(libgio_2_0_la_SOURCES); do \
+               case $$F in \
+               *.c) echo '   <File RelativePath="..\..\..\gio\'$$F'" />' \
+                    ;; \
+               esac; \
+       done >libgio.sourcefiles
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gio.vcprojin >$@
+
 if HAVE_GLIB_RUNTIME_LIBDIR
 install-data-hook:
        mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)