Fix out of tree build for MinGW/MSYS
[platform/upstream/glib.git] / gio / Makefile.am
index b7479e3..69db690 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,8 +24,8 @@ 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 && \
-         mv gio.def.tmp gio.def
+       $(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) > $(builddir)/gio.def.tmp && \
+         mv $(builddir)/gio.def.tmp $(builddir)/gio.def
 
 if OS_LINUX
 if HAVE_GNUC_VISIBILITY
@@ -33,41 +33,15 @@ 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_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 +56,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,10 +85,19 @@ 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 = \
        gsettingsbackend.h              \
+       gsettingsschema.h               \
        gsettings.h
 
 settings_sources = \
@@ -116,32 +107,69 @@ settings_sources = \
        gdelayedsettingsbackend.h       \
        gdelayedsettingsbackend.c       \
        gkeyfilesettingsbackend.c       \
-       gmemorysettingsbackend.h        \
        gmemorysettingsbackend.c        \
-       gnullsettingsbackend.h          \
        gnullsettingsbackend.c          \
        gsettingsbackendinternal.h      \
        gsettingsbackend.c              \
        gsettingsschema.h               \
+       gsettingsschema-internal.h      \
        gsettingsschema.c               \
        gsettings-mapping.h             \
        gsettings-mapping.c             \
        gsettings.c
 
+if OS_WIN32
+settings_sources += \
+       gregistrysettingsbackend.h      \
+       gregistrysettingsbackend.c
+endif
+
+if OS_CARBON
+AM_CPPFLAGS += -DG_OS_CARBON
+
+settings_sources += \
+       gnextstepsettingsbackend.c
+endif
+
 application_headers = \
+       gapplication.h                  \
+       gapplicationcommandline.h       \
+                                       \
        gactiongroup.h                  \
+       gactionmap.h                    \
        gsimpleactiongroup.h            \
+       gremoteactiongroup.h            \
+       gactiongroupexporter.h          \
+       gdbusactiongroup.h              \
        gaction.h                       \
        gsimpleaction.h                 \
-       gapplication.h
+                                       \
+       gmenumodel.h                    \
+       gmenu.h                         \
+       gmenuexporter.h                 \
+       gdbusmenumodel.h                \
+       $(NULL)
 
 application_sources = \
-       gactiongroup.c                  \
-       gsimpleactiongroup.c            \
-       gaction.c                       \
-       gsimpleaction.c                 \
-       gapplication.c
-
+       gapplication.c                          \
+       gapplicationcommandline.c               \
+       gapplicationimpl-dbus.c                 \
+       gapplicationimpl.h                      \
+                                               \
+       gactiongroup.c                          \
+       gactionmap.c                            \
+       gsimpleactiongroup.c                    \
+       gremoteactiongroup.c                    \
+       gactiongroupexporter.c                  \
+       gdbusactiongroup.c                      \
+       gaction.c                               \
+       gsimpleaction.c                         \
+                                               \
+       gmenumodel.c                            \
+       gmenu.c                                 \
+       gmenuexporter.c                         \
+       gdbusmenumodel.c                        \
+       $(NULL)
 
 local_sources = \
        glocaldirectorymonitor.c        \
@@ -193,7 +221,6 @@ platform_libadd += win32/libgiowin32.la
 platform_deps += win32/libgiowin32.la
 endif
 
-
 SUBDIRS += .
 
 if HAVE_FAM
@@ -202,8 +229,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       \
@@ -213,8 +240,6 @@ unix_sources = \
        gunixmount.c            \
        gunixmount.h            \
        gunixmounts.c           \
-       gunixresolver.c         \
-       gunixresolver.h         \
        gunixsocketaddress.c    \
        gunixvolume.c           \
        gunixvolume.h           \
@@ -238,13 +263,18 @@ giounixinclude_HEADERS = \
        gunixoutputstream.h     \
        gunixsocketaddress.h    \
        $(NULL)
+
+if HAVE_NETLINK
+unix_sources +=                         \
+       gnetworkmonitornetlink.c \
+       gnetworkmonitornetlink.h \
+       $(NULL)
+endif
 endif
 
 win32_actual_sources = \
        gwin32mount.c \
        gwin32mount.h \
-       gwin32resolver.c \
-       gwin32resolver.h \
        gwin32volumemonitor.c \
        gwin32volumemonitor.h \
        gwin32inputstream.c \
@@ -254,6 +284,7 @@ win32_actual_sources = \
 
 win32_more_sources_for_vcproj = \
        gwin32appinfo.c \
+       gregistrysettingsbackend.c \
        win32/gwin32directorymonitor.c \
        win32/gwinhttpfile.c \
        win32/gwinhttpfileinputstream.c \
@@ -298,6 +329,8 @@ libgio_2_0_la_SOURCES =             \
        gdummyfile.c            \
        gdummyproxyresolver.c   \
        gdummyproxyresolver.h   \
+       gdummytlsbackend.c      \
+       gdummytlsbackend.h      \
        gemblem.h               \
        gemblem.c               \
        gemblemedicon.h         \
@@ -318,6 +351,7 @@ libgio_2_0_la_SOURCES =             \
        gfilteroutputstream.c   \
        gicon.c                 \
        ginetaddress.c          \
+       ginetaddressmask.c      \
        ginetsocketaddress.c    \
        ginitable.c             \
        ginputstream.c          \
@@ -336,13 +370,21 @@ libgio_2_0_la_SOURCES =           \
        gnativevolumemonitor.h  \
        gnetworkaddress.c       \
        gnetworkingprivate.h    \
+       gnetworkmonitor.c       \
+       gnetworkmonitorbase.c   \
+       gnetworkmonitorbase.h   \
        gnetworkservice.c       \
        goutputstream.c         \
        gpermission.c           \
+       gpollableinputstream.c  \
+       gpollableoutputstream.c \
        gpollfilemonitor.c      \
        gpollfilemonitor.h      \
        gproxyresolver.c        \
        gresolver.c             \
+       gresource.c             \
+       gresourcefile.c         \
+       gresourcefile.h         \
        gseekable.c             \
        gsimpleasyncresult.c    \
        gsimplepermission.c     \
@@ -361,15 +403,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                  \
@@ -387,12 +437,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             \
@@ -403,21 +450,28 @@ libgio_2_0_la_LIBADD = \
        $(SELINUX_LIBS)                                 \
        $(GLIB_LIBS)                                    \
        $(XATTR_LIBS)                                   \
+       $(NETWORK_LIBS)                                 \
        $(NULL)
 
+libgio_2_0_la_CPPFLAGS = $(ZLIB_CFLAGS) $(AM_CPPFLAGS)
+
+if OS_CARBON
+libgio_2_0_la_CFLAGS = -xobjective-c
+endif
+
 if PLATFORM_WIN32
 no_undefined = -no-undefined
 endif
 
 if OS_WIN32_AND_DLL_COMPILATION
-export_symbols = -export-symbols gio.def
+export_symbols = -export-symbols $(builddir)/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
+       $(INSTALL) $(builddir)/gio.def $(DESTDIR)$(libdir)/gio-2.0.def
 
 uninstall-def-file:
        -rm $(DESTDIR)$(libdir)/gio-2.0.def
@@ -425,7 +479,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
@@ -474,6 +528,7 @@ gio_headers =                       \
        gfilteroutputstream.h   \
        gicon.h                 \
        ginetaddress.h          \
+       ginetaddressmask.h      \
        ginetsocketaddress.h    \
        ginputstream.h          \
        ginitable.h             \
@@ -491,14 +546,18 @@ gio_headers =                     \
        gmountoperation.h       \
        gnativevolumemonitor.h  \
        gnetworkaddress.h       \
+       gnetworkmonitor.h       \
        gnetworkservice.h       \
        goutputstream.h         \
        gpermission.h           \
+       gpollableinputstream.h  \
+       gpollableoutputstream.h \
        gproxyaddress.h         \
        gproxy.h                \
        gproxyaddressenumerator.h \
        gproxyresolver.h        \
        gresolver.h             \
+       gresource.h             \
        gseekable.h             \
        gsimpleasyncresult.h    \
        gsimplepermission.h     \
@@ -513,8 +572,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        \
@@ -532,14 +601,13 @@ gioinclude_HEADERS =              \
 
 # these sources (also mentioned above) are generated.
 BUILT_SOURCES =                \
-       gio-marshal.h           \
-       gio-marshal.c           \
+       gconstructor_as_data.h  \
        gioenumtypes.h          \
        gioenumtypes.c          \
        $(NULL)
 
 EXTRA_DIST +=                  \
-       gio-marshal.list        \
+       data-to-c.pl            \
        gio.symbols             \
        gioenumtypes.h.template \
        gioenumtypes.c.template \
@@ -547,14 +615,19 @@ EXTRA_DIST +=                     \
        abicheck.sh             \
        gio.rc.in               \
        gschema.dtd             \
+       gconstructor_as_data.h  \
        $(NULL)
 
 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 gconstructor_as_data.h
+
+all-local: gio-public-headers.txt
 
 gioenumtypes.h: $(gio_headers) gioenumtypes.h.template
        $(AM_V_GEN) ( top_builddir=`cd $(top_builddir) && pwd`; \
@@ -567,9 +640,20 @@ gioenumtypes.c: $(gio_headers) gioenumtypes.c.template
            gioenumtypes.c.tmp && mv gioenumtypes.c.tmp gioenumtypes.c
 
 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:$@
+       lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgio-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(builddir)/gio.def -out:$@
 
-bin_PROGRAMS = gio-querymodules glib-compile-schemas gsettings
+bin_PROGRAMS = gio-querymodules glib-compile-schemas glib-compile-resources gsettings
+
+glib_compile_resources_LDADD = \
+       $(top_builddir)/glib/libglib-2.0.la \
+       $(top_builddir)/gobject/libgobject-2.0.la       \
+       libgio-2.0.la
+
+glib_compile_resources_SOURCES = \
+       gvdb/gvdb-format.h              \
+       gvdb/gvdb-builder.h             \
+       gvdb/gvdb-builder.c             \
+       glib-compile-resources.c
 
 gio_querymodules_SOURCES = gio-querymodules.c
 gio_querymodules_LDADD  = \
@@ -579,12 +663,16 @@ gio_querymodules_LDADD     = \
        libgio-2.0.la                                   \
        $(NULL)
 
+gconstructor_as_data.h: $(top_srcdir)/glib/gconstructor.h data-to-c.pl
+       $(AM_V_GEN) $(srcdir)/data-to-c.pl $(top_srcdir)/glib/gconstructor.h gconstructor_code > $@.tmp && mv $@.tmp $@
+
 glib_compile_schemas_LDADD = $(top_builddir)/glib/libglib-2.0.la
 glib_compile_schemas_SOURCES = \
+       gconstructor_as_data.h \
        gvdb/gvdb-format.h              \
        gvdb/gvdb-builder.h             \
        gvdb/gvdb-builder.c             \
-       gschema-compile.c
+       glib-compile-schemas.c
 
 gsettings_LDADD = \
        $(top_builddir)/glib/libglib-2.0.la             \
@@ -605,23 +693,34 @@ 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)
+       gsettings-bash-completion.sh            \
+       gresource-bash-completion.sh
+EXTRA_DIST += $(completion_DATA)
 
 # ------------------------------------------------------------------------
+# gresource tool
 
-dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gio.vcproj
+bin_PROGRAMS += gresource
+gresource_SOURCES = gresource-tool.c
+gresource_LDADD = libgio-2.0.la \
+       $(top_builddir)/glib/libglib-2.0.la             \
+       $(top_builddir)/gobject/libgobject-2.0.la \
+       $(ELF_LIBS)
+
+# ------------------------------------------------------------------------
+
+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) ;; \
+               gunix*.c|gdesktopappinfo.c|gnetworkmonitornetlink.c) ;; \
                *.c) echo '   <File RelativePath="..\..\..\gio\'$$F'" />' \
                     ;; \
                esac; \
@@ -629,6 +728,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|gnetworkmonitornetlink.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|gnetworkmonitornetlink.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)