projects / platform / upstream / glib.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
gmem: move to glib-ctor
[platform/upstream/glib.git] / gio / Makefile.am
diff --git a/gio/Makefile.am b/gio/Makefile.am
index 1116d74..698fa92 100644 (file)
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -2,10 +2,10 @@ include $(top_srcdir)/Makefile.decl
 
 NULL =
 
-SUBDIRS = gdbus-codegen
+SUBDIRS = gdbus-2.0/codegen
 
 if OS_UNIX
-SUBDIRS += libasyncns xdgmime
+SUBDIRS += xdgmime
 endif
 
 if OS_WIN32_AND_DLL_COMPILATION
@@ -24,7 +24,7 @@ uninstall-ms-lib:
        $(uninstall_ms_lib_cmd)
 
 gio.def: gio.symbols
-       $(AM_V_GEN) (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DINCLUDE_INTERNAL_SYMBOLS -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/gio.symbols | sed -e '/^$$/d' -e 's/^/     /' -e 's/G_GNUC_[^ ]*//g' | sort) > gio.def.tmp && \
+       $(AM_V_GEN) (echo EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DINCLUDE_INTERNAL_SYMBOLS -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/gio.symbols | sed -e '/^$$/d' -e 's/^/        /' -e 's/G_GNUC_[^ ]*//g' | sort) > gio.def.tmp && \
          mv gio.def.tmp gio.def
 
 if OS_LINUX
@@ -33,15 +33,11 @@ TESTS = abicheck.sh
 endif
 endif
 
-if HAVE_THREADS
-THREAD_FLAGS=-DG_THREADS_MANDATORY
-endif
-
 AM_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"GLib-GIO\"                     \
        $(gmodule_INCLUDES)                             \
        $(GLIB_DEBUG_FLAGS)                             \
-       $(THREAD_FLAGS)                                 \
+       -DG_THREADS_MANDATORY                           \
        -DG_DISABLE_DEPRECATED                          \
        -DGIO_COMPILATION                               \
        -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\"  
@@ -204,8 +200,8 @@ endif
 
 if OS_UNIX
 appinfo_sources += gdesktopappinfo.c
-platform_libadd += libasyncns/libasyncns.la xdgmime/libxdgmime.la
-platform_deps += libasyncns/libasyncns.la xdgmime/libxdgmime.la
+platform_libadd += xdgmime/libxdgmime.la $(RESOLVER_LIBADD)
+platform_deps += xdgmime/libxdgmime.la
 unix_sources = \
        gfiledescriptorbased.c  \
        gunixconnection.c       \
@@ -215,8 +211,6 @@ unix_sources = \
        gunixmount.c            \
        gunixmount.h            \
        gunixmounts.c           \
-       gunixresolver.c         \
-       gunixresolver.h         \
        gunixsocketaddress.c    \
        gunixvolume.c           \
        gunixvolume.h           \
@@ -245,8 +239,6 @@ endif
 win32_actual_sources = \
        gwin32mount.c \
        gwin32mount.h \
-       gwin32resolver.c \
-       gwin32resolver.h \
        gwin32volumemonitor.c \
        gwin32volumemonitor.h \
        gwin32inputstream.c \
@@ -256,6 +248,7 @@ win32_actual_sources = \
 
 win32_more_sources_for_vcproj = \
        gwin32appinfo.c \
+       gregistrysettingsbackend.c \
        win32/gwin32directorymonitor.c \
        win32/gwinhttpfile.c \
        win32/gwinhttpfileinputstream.c \
@@ -375,11 +368,14 @@ libgio_2_0_la_SOURCES =           \
        gthemedicon.c           \
        gthreadedresolver.c     \
        gthreadedresolver.h     \
-       gtimezonemonitor.c      \
        gtlsbackend.c           \
        gtlscertificate.c       \
        gtlsclientconnection.c  \
        gtlsconnection.c        \
+       gtlsdatabase.c          \
+       gtlsfiledatabase.c      \
+       gtlsinteraction.c       \
+       gtlspassword.c          \
        gtlsserverconnection.c  \
        gunionvolumemonitor.c   \
        gunionvolumemonitor.h   \
@@ -411,8 +407,11 @@ libgio_2_0_la_LIBADD = \
        $(SELINUX_LIBS)                                 \
        $(GLIB_LIBS)                                    \
        $(XATTR_LIBS)                                   \
+       $(NETWORK_LIBS)                                 \
        $(NULL)
 
+libgio_2_0_la_CPPFLAGS = $(ZLIB_CFLAGS) $(AM_CPPFLAGS)
+
 if PLATFORM_WIN32
 no_undefined = -no-undefined
 endif
@@ -526,11 +525,14 @@ gio_headers =                     \
        gtcpwrapperconnection.h \
        gthreadedsocketservice.h\
        gthemedicon.h           \
-       gtimezonemonitor.h      \
        gtlsbackend.h           \
        gtlscertificate.h       \
        gtlsclientconnection.h  \
        gtlsconnection.h        \
+       gtlsdatabase.h          \
+       gtlsfiledatabase.h      \
+       gtlsinteraction.h       \
+       gtlspassword.h          \
        gtlsserverconnection.h  \
        gvfs.h                  \
        gvolume.h               \
@@ -568,7 +570,7 @@ BUILT_EXTRA_DIST =          \
 
 # This is read by gobject-introspection/misc/ and gtk-doc
 gio-public-headers.txt: Makefile
-       echo $(gioinclude_HEADERS) > $@.tmp && mv $@.tmp $@
+       echo $(gioinclude_HEADERS) $(giowin32include_HEADERS) $(giounixinclude_HEADERS) > $@.tmp && mv $@.tmp $@
 
 CLEANFILES = gio-public-headers.txt
 
@@ -623,10 +625,10 @@ gdbus_LDADD = libgio-2.0.la \
        $(top_builddir)/gobject/libgobject-2.0.la
 
 completiondir = $(sysconfdir)/bash_completion.d
-completion_SCRIPTS = \
+completion_DATA = \
        gdbus-bash-completion.sh                \
        gsettings-bash-completion.sh
-EXTRA_DIST += $(completion_SCRIPTS)
+EXTRA_DIST += $(completion_DATA)
 
 # ------------------------------------------------------------------------
 
@@ -637,7 +639,7 @@ dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gio.vcproj ../build/win32/vs10
          cp $$d/$$f $(distdir) || exit 1; done
 
 ../build/win32/vs9/gio.vcproj: $(top_srcdir)/build/win32/vs9/gio.vcprojin
-       for F in `echo $(libgio_2_0_la_SOURCES) $(win32_actual_sources) $(win32_actual_more_sources_for_vcproj) | tr '/' '\\'`; do \
+       for F in `echo $(libgio_2_0_la_SOURCES) $(win32_actual_sources) $(win32_more_sources_for_vcproj) | tr '/' '\\'`; do \
                case $$F in \
                gunix*.c|gdesktopappinfo.c) ;; \
                *.c) echo '   <File RelativePath="..\..\..\gio\'$$F'" />' \
@@ -648,7 +650,7 @@ dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gio.vcproj ../build/win32/vs10
        rm libgio.sourcefiles
 
 ../build/win32/vs10/gio.vcxproj: $(top_srcdir)/build/win32/vs10/gio.vcxprojin
-       for F in `echo $(libgio_2_0_la_SOURCES) $(win32_actual_sources) $(win32_actual_more_sources_for_vcproj) | tr '/' '\\'`; do \
+       for F in `echo $(libgio_2_0_la_SOURCES) $(win32_actual_sources) $(win32_more_sources_for_vcproj) | tr '/' '\\'`; do \
                case $$F in \
                gunix*.c|gdesktopappinfo.c) ;; \
                *.c) echo '    <ClCompile Include="..\..\..\gio\'$$F'" />' \
@@ -659,7 +661,7 @@ dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gio.vcproj ../build/win32/vs10
        rm libgio.vs10.sourcefiles
 
 ../build/win32/vs10/gio.vcxproj.filters: $(top_srcdir)/build/win32/vs10/gio.vcxproj.filtersin
-       for F in `echo $(libgio_2_0_la_SOURCES) $(win32_actual_sources) $(win32_actual_more_sources_for_vcproj) | tr '/' '\\'`; do \
+       for F in `echo $(libgio_2_0_la_SOURCES) $(win32_actual_sources) $(win32_more_sources_for_vcproj) | tr '/' '\\'`; do \
                case $$F in \
                gunix*.c|gdesktopappinfo.c) ;; \
                *.c) echo '    <ClCompile Include="..\..\..\gio\'$$F'"><Filter>Source Files</Filter></ClCompile>' \
Domain: System / Base;