Update to version 2.33.1

[profile/ivi/glib2.git] / gio / Makefile.am

diff --git a/gio/Makefile.am b/gio/Makefile.am
index dc57ded..dae04b4 100644 (file)
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -24,8 +24,8 @@ uninstall-ms-lib:
        $(uninstall_ms_lib_cmd)
 
 gio.def: gio.symbols
-       $(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
+       $(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
@@ -64,6 +64,7 @@ gdbus_headers =                       \
        gdbusobjectmanager.h            \
        gdbusobjectmanagerclient.h      \
        gdbusobjectmanagerserver.h      \
+       gtestdbus.h                     \
        $(NULL)
 
 gdbus_sources =                                                        \
@@ -93,8 +94,22 @@ gdbus_sources =                                                      \
        gdbusobjectmanager.h            gdbusobjectmanager.c            \
        gdbusobjectmanagerclient.h      gdbusobjectmanagerclient.c      \
        gdbusobjectmanagerserver.h      gdbusobjectmanagerserver.c      \
+       gtestdbus.h                     gtestdbus.c                     \
        $(NULL)
 
+# These are not built into the library yet
+EXTRA_DIST += gdbusdaemon.c gdbusdaemon.h dbus-daemon.xml
+
+gdbus-daemon-generated.h gdbus-daemon-generated.c: $(srcdir)/dbus-daemon.xml $(srcdir)/gdbus-2.0/codegen/gdbus-codegen.in
+       $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
+               UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
+               $(PYTHON) $(srcdir)/gdbus-2.0/codegen/gdbus-codegen.in \
+               --interface-prefix org. \
+               --generate-c-code gdbus-daemon-generated \
+               --c-namespace _G \
+               $(srcdir)/dbus-daemon.xml \
+               $(NULL)
+
 settings_headers = \
        gsettingsbackend.h              \
        gsettingsschema.h               \
@@ -124,9 +139,7 @@ settings_sources += \
        gregistrysettingsbackend.c
 endif
 
-if OS_CARBON
-AM_CPPFLAGS += -DG_OS_CARBON
-
+if OS_COCOA
 settings_sources += \
        gnextstepsettingsbackend.c
 endif
@@ -272,7 +285,15 @@ unix_sources +=                     \
 endif
 endif
 
+gdbus_daemon_sources = \
+       gdbusdaemon.c \
+       gdbusdaemon.h \
+       gdbus-daemon-generated.c \
+       gdbus-daemon-generated.h \
+       $(NULL)
+
 win32_actual_sources = \
+       $(gdbus_daemon_sources) \
        gwin32mount.c \
        gwin32mount.h \
        gwin32volumemonitor.c \
@@ -304,7 +325,9 @@ giowin32include_HEADERS = \
 
 endif
 
-SUBDIRS += tests
+if BUILD_MODULAR_TESTS
+SUBDIRS += tests 
+endif
 
 libgio_2_0_la_SOURCES =                \
        gappinfo.c              \
@@ -378,6 +401,7 @@ libgio_2_0_la_SOURCES =             \
        gpermission.c           \
        gpollableinputstream.c  \
        gpollableoutputstream.c \
+       gpollableutils.c        \
        gpollfilemonitor.c      \
        gpollfilemonitor.h      \
        gproxyresolver.c        \
@@ -455,23 +479,19 @@ libgio_2_0_la_LIBADD = \
 
 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
@@ -492,6 +512,12 @@ libgio_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
        -export-dynamic $(no_undefined) $(export_symbols)
 
+if OS_COCOA
+# This is dumb.  The ObjC source file should be properly named .m
+libgio_2_0_la_CFLAGS = -xobjective-c
+libgio_2_0_la_LDFLAGS += -framework Foundation
+endif
+
 libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps)
 
 gio-win32-res.o: gio.rc
@@ -552,6 +578,7 @@ gio_headers =                       \
        gpermission.h           \
        gpollableinputstream.h  \
        gpollableoutputstream.h \
+       gpollableutils.h        \
        gproxyaddress.h         \
        gproxy.h                \
        gproxyaddressenumerator.h \
@@ -604,6 +631,8 @@ BUILT_SOURCES =             \
        gconstructor_as_data.h  \
        gioenumtypes.h          \
        gioenumtypes.c          \
+       gdbus-daemon-generated.c \
+       gdbus-daemon-generated.h \
        $(NULL)
 
 EXTRA_DIST +=                  \
@@ -625,7 +654,7 @@ BUILT_EXTRA_DIST =          \
 gio-public-headers.txt: Makefile
        echo $(gioinclude_HEADERS) $(giowin32include_HEADERS) $(giounixinclude_HEADERS) > $@.tmp && mv $@.tmp $@
 
-CLEANFILES = gio-public-headers.txt gconstructor_as_data.h
+CLEANFILES = gdbus-daemon-generated.c gdbus-daemon-generated.h gio-public-headers.txt gconstructor_as_data.h
 
 all-local: gio-public-headers.txt
 
@@ -640,7 +669,7 @@ 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 glib-compile-resources gsettings
 
@@ -704,10 +733,11 @@ EXTRA_DIST += $(completion_DATA)
 
 bin_PROGRAMS += gresource
 gresource_SOURCES = gresource-tool.c
+gresource_CPPFLAGS = $(LIBELF_CFLAGS) $(AM_CPPFLAGS)
 gresource_LDADD = libgio-2.0.la \
        $(top_builddir)/glib/libglib-2.0.la             \
        $(top_builddir)/gobject/libgobject-2.0.la \
-       $(ELF_LIBS)
+       $(LIBELF_LIBS)
 
 # ------------------------------------------------------------------------