From 2e47d49bc91d83cd0abea4c1944bfca4336040fa Mon Sep 17 00:00:00 2001 From: Sobhan Mohammadpour Date: Fri, 23 Feb 2018 15:27:33 +0330 Subject: [PATCH] glib-2.54.3-external-gdbus-codegen-for-autotools --- configure.ac | 1 - docs/reference/gio/Makefile.am | 1 - gio/Makefile.am | 2 +- gio/tests/Makefile.am | 6 ++---- gio/tests/gdbus-object-manager-example/Makefile.am | 6 ++---- 5 files changed, 5 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index 0457c90..07166c9 100644 --- a/configure.ac +++ b/configure.ac @@ -3469,7 +3469,6 @@ gobject/glib-mkenums gobject/tests/Makefile gthread/Makefile gio/Makefile -gio/gdbus-2.0/codegen/Makefile gio/gdbus-2.0/codegen/config.py gio/gnetworking.h gio/xdgmime/Makefile diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am index 5741a3e..d38e768 100644 --- a/docs/reference/gio/Makefile.am +++ b/docs/reference/gio/Makefile.am @@ -177,7 +177,6 @@ man_MANS += \ gsettings.1 \ gresource.1 \ gdbus.1 \ - gdbus-codegen.1 \ gio.1 \ $(NULL) diff --git a/gio/Makefile.am b/gio/Makefile.am index b2db995..53d7162 100644 --- a/gio/Makefile.am +++ b/gio/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/glib.mk -SUBDIRS = gdbus-2.0/codegen +SUBDIRS = if OS_UNIX if !OS_COCOA diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am index acc1da4..7c51eab 100644 --- a/gio/tests/Makefile.am +++ b/gio/tests/Makefile.am @@ -460,10 +460,8 @@ gnotification_SOURCES = $(gdbus_sessionbus_sources) gnotifica BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h gdbus-test-codegen.o: gdbus-test-codegen-generated.h -gdbus-test-codegen-generated.h: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen - $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ - UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ - $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \ +gdbus-test-codegen-generated.h: test-codegen.xml Makefile + $(AM_V_GEN) gdbus-codegen \ --interface-prefix org.project. \ --generate-c-code gdbus-test-codegen-generated \ --c-generate-object-manager \ diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am index 1d0464c..f390dca 100644 --- a/gio/tests/gdbus-object-manager-example/Makefile.am +++ b/gio/tests/gdbus-object-manager-example/Makefile.am @@ -11,10 +11,8 @@ GDBUS_GENERATED = \ gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml \ $(NULL) -$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen - $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ - UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ - $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \ +$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile + $(AM_V_GEN) gdbus-codegen \ --interface-prefix org.gtk.GDBus.Example.ObjectManager. \ --c-namespace Example \ --c-generate-object-manager \ -- 2.16.1