Merge the keyfile settings backend.

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

diff --git a/gio/Makefile.am b/gio/Makefile.am
index 3e7bb3e..1f3ff10 100644 (file)
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -41,6 +41,10 @@ TESTS = abicheck.sh pltcheck.sh
 endif
 endif
 
+if HAVE_THREADS
+THREAD_FLAGS=-DG_THREADS_MANDATORY
+endif
+
 AM_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"GLib-GIO\"                     \
        -I$(top_builddir)                               \
@@ -48,6 +52,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/glib                            \
        -I$(top_srcdir)/gmodule                         \
        $(GLIB_DEBUG_FLAGS)                             \
+       $(THREAD_FLAGS)                                 \
        -DG_DISABLE_DEPRECATED                          \
        -DGIO_COMPILATION                               \
        -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\"  
@@ -74,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        \
@@ -152,6 +179,7 @@ unix_sources = \
 giounixincludedir=$(includedir)/gio-unix-2.0/gio
 giounixinclude_HEADERS = \
        gdesktopappinfo.h       \
+       gfiledescriptorbased.h  \
        gunixconnection.h       \
        gunixmounts.h           \
        gunixfdlist.h           \
@@ -205,6 +233,8 @@ libgio_2_0_la_SOURCES =             \
        gfile.c                 \
        gfileattribute.c        \
        gfileattribute-priv.h   \
+       gfiledescriptorbased.h  \
+       gfiledescriptorbased.c  \
        gfileenumerator.c       \
        gfileicon.c             \
        gfileinfo.c             \
@@ -264,7 +294,6 @@ libgio_2_0_la_SOURCES =             \
        gthreadedresolver.h     \
        gunionvolumemonitor.c   \
        gunionvolumemonitor.h   \
-       gutf8inputstream.c      \
        gvfs.c                  \
        gvolume.c               \
        gvolumemonitor.c        \
@@ -278,6 +307,7 @@ libgio_2_0_la_SOURCES =             \
        $(appinfo_sources)      \
        $(unix_sources)         \
        $(win32_sources)        \
+       $(settings_sources)     \
        $(local_sources)        \
        $(marshal_sources)      \
        $(NULL)
@@ -303,6 +333,9 @@ if OS_WIN32_AND_DLL_COMPILATION
 export_symbols = -export-symbols gio.def
 gio_def = gio.def
 
+gio_win32_res = gio-win32-res.o
+gio_win32_res_ldflag = -Wl,$(gio_win32_res)
+
 install-def-file:
        $(INSTALL) gio.def $(DESTDIR)$(libdir)/gio-2.0.def
 
@@ -321,10 +354,14 @@ install-data-local: install-ms-lib install-def-file
 uninstall-local: uninstall-ms-lib uninstall-def-file
 
 libgio_2_0_la_LDFLAGS = \
+       $(gio_win32_res_ldflag) \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
        -export-dynamic $(no_undefined) $(export_symbols)
 
-libgio_2_0_la_DEPENDENCIES = $(gio_def) $(platform_deps)
+libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps)
+
+gio-win32-res.o: gio.rc
+       $(WINDRES) gio.rc $@
 
 gio_headers =                  \
        gappinfo.h              \
@@ -392,12 +429,12 @@ gio_headers =                     \
        gtcpconnection.h        \
        gthreadedsocketservice.h\
        gthemedicon.h           \
-       gutf8inputstream.c      \
        gvfs.h                  \
        gvolume.h               \
        gvolumemonitor.h        \
        gzlibcompressor.h       \
        gzlibdecompressor.h     \
+       $(settings_headers)     \
        $(NULL)
 
 gioincludedir=$(includedir)/glib-2.0/gio/
@@ -424,8 +461,12 @@ EXTRA_DIST +=                      \
        makegioalias.pl         \
        abicheck.sh             \
        pltcheck.sh             \
+       gio.rc.in               \
        $(NULL)
 
+BUILT_EXTRA_DIST =             \
+       gio.rc
+
 CLEANFILES =                   \
        $(marshal_sources)      \
        $(NULL)
@@ -443,6 +484,37 @@ 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 gschema-compile
+gio_querymodules_SOURCES = gio-querymodules.c
+gio_querymodules_LDADD  = \
+       $(top_builddir)/glib/libglib-2.0.la             \
+       $(top_builddir)/gobject/libgobject-2.0.la       \
+       $(top_builddir)/gmodule/libgmodule-2.0.la       \
+       libgio-2.0.la                                   \
+       $(NULL)
+
+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)