Attachment 47365 Details for Bug 37789 – [PATCH 3/5] Remove vestigial dbus-glib-error-*.h and the machinery to generate them

[patch] [PATCH 3/5] Remove vestigial dbus-glib-error-*.h and the machinery to generate them

0003-Remove-vestigial-dbus-glib-error-.h-and-the-machiner.patch (text/plain), 3.86 KB, created by Simon McVittie on 2011-05-31 07:03:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-05-31 07:03:59 UTC

Size: 3.86 KB

patch

obsolete

>From 6570c446f1fe3c9704223af76b955805a21df488 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Mon, 28 Mar 2011 14:39:57 +0100
>Subject: [PATCH 3/5] Remove vestigial dbus-glib-error-*.h and the machinery
> to generate them
>
>This was the only use of DBUS_INCLUDEDIR, so remove that too.
>---
> .gitignore                          |    4 ----
> configure.ac                        |    2 --
> dbus/Makefile.am                    |   16 ++--------------
> dbus/make-dbus-glib-error-enum.sh   |    2 --
> dbus/make-dbus-glib-error-switch.sh |    2 --
> 5 files changed, 2 insertions(+), 24 deletions(-)
> delete mode 100755 dbus/make-dbus-glib-error-enum.sh
> delete mode 100755 dbus/make-dbus-glib-error-switch.sh
>
>diff --git a/.gitignore b/.gitignore
>index 01efaf1..f415f9d 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -28,8 +28,6 @@ dbus/Makefile.in
> /dbus/dbus-bash-completion-helper
> /dbus/dbus-bash-completion.sh
> dbus/dbus-binding-tool
>-dbus/dbus-glib-error-enum.h
>-dbus/dbus-glib-error-switch.h
> dbus/dbus-glib-test
> dbus/examples/Makefile
> dbus/examples/Makefile.in
>@@ -138,8 +136,6 @@ dbus-glib-1.pc
> dbus/Makefile
> dbus/Makefile.in
> dbus/dbus-binding-tool
>-dbus/dbus-glib-error-enum.h
>-dbus/dbus-glib-error-switch.h
> dbus/dbus-glib-test
> dbus/examples/Makefile
> dbus/examples/Makefile.in
>diff --git a/configure.ac b/configure.ac
>index 011a2ba..e854dc2 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -357,8 +357,6 @@ PKG_CHECK_MODULES([DBUS], [dbus-1 >= 1.2.16])
> AC_SUBST([DBUS_CFLAGS])
> AC_SUBST([DBUS_LIBS])
> 
>-DBUS_INCLUDEDIR=`pkg-config dbus-1 --variable=includedir`
>-AC_SUBST(DBUS_INCLUDEDIR)
> DBUS_DAEMONDIR=`pkg-config dbus-1 --variable=daemondir`
> if test x"$DBUS_DAEMONDIR" != "x"; then
>     # Add slash, so that if the D-Bus pkgconfig file does not
>diff --git a/dbus/Makefile.am b/dbus/Makefile.am
>index b79f870..325f8bb 100644
>--- a/dbus/Makefile.am
>+++ b/dbus/Makefile.am
>@@ -11,16 +11,6 @@ INCLUDES = \
> 
> lib_LTLIBRARIES=libdbus-glib-1.la
> 
>-dbus-glib-error-enum.h: make-dbus-glib-error-enum.sh
>-	$(srcdir)/make-dbus-glib-error-enum.sh $(DBUS_INCLUDEDIR)/dbus-1.0/dbus/dbus-protocol.h $@
>-
>-dbus-glib-error-switch.h: make-dbus-glib-error-switch.sh
>-	$(LIBTOOL) --mode=execute $(srcdir)/make-dbus-glib-error-switch.sh $(DBUS_INCLUDEDIR)/dbus-1.0/dbus/dbus-protocol.h $@
>-
>-BUILT_SOURCES = \
>-	dbus-glib-error-switch.h		\
>-	dbus-glib-error-enum.h
>-
> CLEANFILES = $(BUILT_SOURCES)
> 
> DBUS_GLIB_INTERNALS = \
>@@ -35,7 +25,6 @@ DBUS_GLIB_INTERNALS = \
> 	dbus-gvalue-utils.h
> 
> libdbus_glib_1_la_SOURCES = 			\
>-	dbus-glib-error-switch.h		\
> 	dbus-glib.c				\
> 	dbus-gmain.c				\
> 	dbus-gmarshal.c				\
>@@ -55,8 +44,7 @@ libdbus_glib_HEADERS =                  \
> 	dbus-gtype-specialized.h	\
>         dbus-gvalue-parse-variant.h	\
> 	dbus-glib.h			\
>-        dbus-glib-lowlevel.h		\
>-        dbus-glib-error-enum.h
>+        dbus-glib-lowlevel.h
> 
> libdbus_glibdir = $(includedir)/dbus-1.0/dbus
> 
>@@ -111,7 +99,7 @@ dbus_bash_completion_helper_SOURCES =                 	\
> dbus_bash_completion_helper_LDADD=$(builddir)/libdbus-gtool.la -lexpat $(builddir)/libdbus-glib-1.la $(DBUS_LIBS) $(DBUS_GLIB_LIBS)
> 
> 
>-EXTRA_DIST=dbus-gmarshal.list make-dbus-glib-error-switch.sh make-dbus-glib-error-enum.sh dbus-bash-completion.sh.in
>+EXTRA_DIST=dbus-gmarshal.list dbus-bash-completion.sh.in
> 
> if DBUS_BUILD_TESTS
> 
>diff --git a/dbus/make-dbus-glib-error-enum.sh b/dbus/make-dbus-glib-error-enum.sh
>deleted file mode 100755
>index 1d7929a..0000000
>--- a/dbus/make-dbus-glib-error-enum.sh
>+++ /dev/null
>@@ -1,2 +0,0 @@
>-#!/bin/sh
>-echo "#error This header makes no sense - see bugs.freedesktop.org 15430" >$2
>diff --git a/dbus/make-dbus-glib-error-switch.sh b/dbus/make-dbus-glib-error-switch.sh
>deleted file mode 100755
>index 1d7929a..0000000
>--- a/dbus/make-dbus-glib-error-switch.sh
>+++ /dev/null
>@@ -1,2 +0,0 @@
>-#!/bin/sh
>-echo "#error This header makes no sense - see bugs.freedesktop.org 15430" >$2
>-- 
>1.7.5.3
>

Actions: View | Splinter Review

Attachments on bug 37789: 47363 | 47364 | 47365 | 47366 | 47367

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.