| diff --git a/configure.ac b/configure.ac |
| index e8e7553..216e59d 100644 |
| --- a/configure.ac |
| +++ b/configure.ac |
| @@ -385,14 +385,14 @@ AC_SUBST(PERL_PATH) |
| # option to specify python interpreter to use; this just sets $PYTHON, so that |
| # we will fallback to reading $PYTHON if --with-python is not given, and |
| # python.m4 will get the expected input |
| -AC_ARG_WITH(python, |
| - AS_HELP_STRING([--with-python=PATH], |
| - [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]), |
| - [PYTHON="$withval"], []) |
| -if test x"$PYTHON" = xyes; then |
| - AC_MSG_ERROR([--with-python option requires a path or program argument]) |
| -fi |
| -AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5") |
| +# AC_ARG_WITH(python, |
| +# AS_HELP_STRING([--with-python=PATH], |
| +# [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]), |
| +# [PYTHON="$withval"], []) |
| +# if test x"$PYTHON" = xyes; then |
| +# AC_MSG_ERROR([--with-python option requires a path or program argument]) |
| +# fi |
| +# AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5") |
| |
| |
| dnl *********************** |
| @@ -3453,7 +3453,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 ffe5ee2..929d1b5 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 |
| SUBDIRS += xdgmime |
| diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am |
| index 749267b..f2a8c63 100644 |
| --- a/gio/tests/Makefile.am |
| +++ b/gio/tests/Makefile.am |
| @@ -449,10 +449,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..0603d9b 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 \ |
