gmem: move to glib-ctor
[platform/upstream/glib.git] / gio / Makefile.am
index 50a5aed..698fa92 100644 (file)
@@ -2,10 +2,10 @@ include $(top_srcdir)/Makefile.decl
 
 NULL =
 
-SUBDIRS=
+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,41 +33,17 @@ 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)\"  
 
 lib_LTLIBRARIES = libgio-2.0.la
 
-marshal_sources = \
-        gio-marshal.h  \
-        gio-marshal.c  \
-       $(NULL)
-
-if CROSS_COMPILING
-  glib_genmarshal=$(GLIB_GENMARSHAL)
-else
-  glib_genmarshal=../gobject/glib-genmarshal
-endif
-
-gio-marshal.h: gio-marshal.list
-       $(AM_V_GEN) $(glib_genmarshal) --prefix=_gio_marshal $(srcdir)/gio-marshal.list --header --internal > $@.tmp && \
-         mv $@.tmp $@
-
-gio-marshal.c: gio-marshal.h gio-marshal.list
-       $(AM_V_GEN) (echo "#include \"gio-marshal.h\""; \
-       $(glib_genmarshal) --prefix=_gio_marshal $(srcdir)/gio-marshal.list --body --internal) > $@.tmp && \
-         mv $@.tmp $@
-
 gdbus_headers =                        \
        gdbusauthobserver.h             \
        gcredentials.h                  \
@@ -82,6 +58,14 @@ gdbus_headers =                      \
        gdbusintrospection.h            \
        gdbusmethodinvocation.h         \
        gdbusserver.h                   \
+       gdbusinterface.h                \
+       gdbusinterfaceskeleton.h        \
+       gdbusobject.h                   \
+       gdbusobjectskeleton.h           \
+       gdbusobjectproxy.h              \
+       gdbusobjectmanager.h            \
+       gdbusobjectmanagerclient.h      \
+       gdbusobjectmanagerserver.h      \
        $(NULL)
 
 gdbus_sources =                                                        \
@@ -103,6 +87,14 @@ gdbus_sources =                                                     \
        gdbusintrospection.h            gdbusintrospection.c            \
        gdbusmethodinvocation.h         gdbusmethodinvocation.c         \
        gdbusserver.h                   gdbusserver.c                   \
+       gdbusinterface.h                gdbusinterface.c                \
+       gdbusinterfaceskeleton.h        gdbusinterfaceskeleton.c        \
+       gdbusobject.h                   gdbusobject.c                   \
+       gdbusobjectskeleton.h           gdbusobjectskeleton.c           \
+       gdbusobjectproxy.h              gdbusobjectproxy.c              \
+       gdbusobjectmanager.h            gdbusobjectmanager.c            \
+       gdbusobjectmanagerclient.h      gdbusobjectmanagerclient.c      \
+       gdbusobjectmanagerserver.h      gdbusobjectmanagerserver.c      \
        $(NULL)
 
 settings_headers = \
@@ -116,9 +108,7 @@ settings_sources = \
        gdelayedsettingsbackend.h       \
        gdelayedsettingsbackend.c       \
        gkeyfilesettingsbackend.c       \
-       gmemorysettingsbackend.h        \
        gmemorysettingsbackend.c        \
-       gnullsettingsbackend.h          \
        gnullsettingsbackend.c          \
        gsettingsbackendinternal.h      \
        gsettingsbackend.c              \
@@ -139,6 +129,7 @@ application_headers = \
        gsimpleactiongroup.h            \
        gaction.h                       \
        gsimpleaction.h                 \
+       gapplicationcommandline.h       \
        gapplication.h
 
 application_sources = \
@@ -146,6 +137,8 @@ application_sources = \
        gsimpleactiongroup.c                    \
        gaction.c                               \
        gsimpleaction.c                         \
+       gapplicationcommandline.c               \
+       gapplicationimpl.h                      \
        gapplicationimpl-dbus.c                 \
        gapplication.c
 
@@ -199,7 +192,6 @@ platform_libadd += win32/libgiowin32.la
 platform_deps += win32/libgiowin32.la
 endif
 
-
 SUBDIRS += .
 
 if HAVE_FAM
@@ -208,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       \
@@ -219,8 +211,6 @@ unix_sources = \
        gunixmount.c            \
        gunixmount.h            \
        gunixmounts.c           \
-       gunixresolver.c         \
-       gunixresolver.h         \
        gunixsocketaddress.c    \
        gunixvolume.c           \
        gunixvolume.h           \
@@ -249,8 +239,6 @@ endif
 win32_actual_sources = \
        gwin32mount.c \
        gwin32mount.h \
-       gwin32resolver.c \
-       gwin32resolver.h \
        gwin32volumemonitor.c \
        gwin32volumemonitor.h \
        gwin32inputstream.c \
@@ -260,6 +248,7 @@ win32_actual_sources = \
 
 win32_more_sources_for_vcproj = \
        gwin32appinfo.c \
+       gregistrysettingsbackend.c \
        win32/gwin32directorymonitor.c \
        win32/gwinhttpfile.c \
        win32/gwinhttpfileinputstream.c \
@@ -304,6 +293,8 @@ libgio_2_0_la_SOURCES =             \
        gdummyfile.c            \
        gdummyproxyresolver.c   \
        gdummyproxyresolver.h   \
+       gdummytlsbackend.c      \
+       gdummytlsbackend.h      \
        gemblem.h               \
        gemblem.c               \
        gemblemedicon.h         \
@@ -345,6 +336,8 @@ libgio_2_0_la_SOURCES =             \
        gnetworkservice.c       \
        goutputstream.c         \
        gpermission.c           \
+       gpollableinputstream.c  \
+       gpollableoutputstream.c \
        gpollfilemonitor.c      \
        gpollfilemonitor.h      \
        gproxyresolver.c        \
@@ -367,15 +360,23 @@ libgio_2_0_la_SOURCES =           \
        gproxy.c                \
        gproxyaddress.c         \
        gproxyaddressenumerator.c \
-       gproxyconnection.c      \
-       gproxyconnection.h      \
        gsocketservice.c        \
        gsrvtarget.c            \
        gtcpconnection.c        \
+       gtcpwrapperconnection.c \
        gthreadedsocketservice.c\
        gthemedicon.c           \
        gthreadedresolver.c     \
        gthreadedresolver.h     \
+       gtlsbackend.c           \
+       gtlscertificate.c       \
+       gtlsclientconnection.c  \
+       gtlsconnection.c        \
+       gtlsdatabase.c          \
+       gtlsfiledatabase.c      \
+       gtlsinteraction.c       \
+       gtlspassword.c          \
+       gtlsserverconnection.c  \
        gunionvolumemonitor.c   \
        gunionvolumemonitor.h   \
        gvfs.c                  \
@@ -393,12 +394,9 @@ libgio_2_0_la_SOURCES =            \
        $(settings_sources)     \
        $(gdbus_sources)        \
        $(local_sources)        \
-       $(marshal_sources)      \
        $(NULL)
 
-EXTRA_DIST += gnullapplication.c gdbusapplication.c strinfo.c
-
-$(libgio_2_0_la_OBJECTS): $(marshal_sources)
+EXTRA_DIST += strinfo.c
 
 libgio_2_0_la_LIBADD = \
        $(top_builddir)/glib/libglib-2.0.la             \
@@ -409,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
@@ -431,7 +432,7 @@ else
 install-def-file:
 uninstall-def-file:
 
-export_symbols = -export-symbols-regex '^g_.*'
+export_symbols = $(LIBTOOL_EXPORT_OPTIONS)
 endif
 
 install-data-local: install-ms-lib install-def-file
@@ -500,6 +501,8 @@ gio_headers =                       \
        gnetworkservice.h       \
        goutputstream.h         \
        gpermission.h           \
+       gpollableinputstream.h  \
+       gpollableoutputstream.h \
        gproxyaddress.h         \
        gproxy.h                \
        gproxyaddressenumerator.h \
@@ -519,8 +522,18 @@ gio_headers =                      \
        gsocketservice.h        \
        gsrvtarget.h            \
        gtcpconnection.h        \
+       gtcpwrapperconnection.h \
        gthreadedsocketservice.h\
        gthemedicon.h           \
+       gtlsbackend.h           \
+       gtlscertificate.h       \
+       gtlsclientconnection.h  \
+       gtlsconnection.h        \
+       gtlsdatabase.h          \
+       gtlsfiledatabase.h      \
+       gtlsinteraction.h       \
+       gtlspassword.h          \
+       gtlsserverconnection.h  \
        gvfs.h                  \
        gvolume.h               \
        gvolumemonitor.h        \
@@ -538,14 +551,11 @@ gioinclude_HEADERS =              \
 
 # these sources (also mentioned above) are generated.
 BUILT_SOURCES =                \
-       gio-marshal.h           \
-       gio-marshal.c           \
        gioenumtypes.h          \
        gioenumtypes.c          \
        $(NULL)
 
 EXTRA_DIST +=                  \
-       gio-marshal.list        \
        gio.symbols             \
        gioenumtypes.h.template \
        gioenumtypes.c.template \
@@ -558,9 +568,13 @@ EXTRA_DIST +=                      \
 BUILT_EXTRA_DIST =             \
        gio.rc
 
-CLEANFILES =                   \
-       $(marshal_sources)      \
-       $(NULL)
+# This is read by gobject-introspection/misc/ and gtk-doc
+gio-public-headers.txt: Makefile
+       echo $(gioinclude_HEADERS) $(giowin32include_HEADERS) $(giounixinclude_HEADERS) > $@.tmp && mv $@.tmp $@
+
+CLEANFILES = gio-public-headers.txt
+
+all-local: gio-public-headers.txt
 
 gioenumtypes.h: $(gio_headers) gioenumtypes.h.template
        $(AM_V_GEN) ( top_builddir=`cd $(top_builddir) && pwd`; \
@@ -611,21 +625,21 @@ 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)
 
 # ------------------------------------------------------------------------
 
-dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gio.vcproj
+dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gio.vcproj ../build/win32/vs10/gio.vcxproj ../build/win32/vs10/gio.vcxproj.filters
        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 `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'" />' \
@@ -635,6 +649,28 @@ dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gio.vcproj
        $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gio.vcprojin >$@
        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_more_sources_for_vcproj) | tr '/' '\\'`; do \
+               case $$F in \
+               gunix*.c|gdesktopappinfo.c) ;; \
+               *.c) echo '    <ClCompile Include="..\..\..\gio\'$$F'" />' \
+                    ;; \
+               esac; \
+       done | sort -u >libgio.vs10.sourcefiles
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gio.vcxprojin >$@
+       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_more_sources_for_vcproj) | tr '/' '\\'`; do \
+               case $$F in \
+               gunix*.c|gdesktopappinfo.c) ;; \
+               *.c) echo '    <ClCompile Include="..\..\..\gio\'$$F'"><Filter>Source Files</Filter></ClCompile>' \
+                    ;; \
+               esac; \
+       done | sort -u >libgio.vs10.sourcefiles.filters
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gio.vcxproj.filtersin >$@
+       rm libgio.vs10.sourcefiles.filters
+
 if HAVE_GLIB_RUNTIME_LIBDIR
 install-data-hook:
        mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)