From: Kay Sievers <kay.sievers@vrfy.org>
Date: Thu, 3 Dec 2009 13:36:36 +0000 (+0100)
Subject: fix both in-tree and out-of-tree builds
X-Git-Tag: 174~685
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=baf2e222d5c06cb3c4ee7d625e531119d3a999ba

fix both in-tree and out-of-tree builds

On Thu, Dec 3, 2009 at 14:31, Daniel Elstner <daniel.kitta@googlemail.com> wrote:
> However, I'd recommend to look first in the build directory, and then in
> the source directory to match the behavior of make with VPATH builds.
> The idea is that a file in the build tree, if it exists, overrides a
> file of the same name in the source tree.
---

diff --git a/Makefile.am b/Makefile.am
index 83ecb7451..3e9713fc9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -383,14 +383,14 @@ extras/gudev/GUdev-1.0.gir: extras/gudev/libgudev-1.0.la $(G_IR_SCANNER) Makefil
 		--output $@ \
 		--pkg=glib-2.0 \
 		--pkg=gobject-2.0 \
-		-I$(top_srcdir)/extras \
 		-I$(top_builddir)/extras \
+		-I$(top_srcdir)/extras \
 		-D_GUDEV_COMPILATION \
 		-D_GUDEV_WORK_AROUND_DEV_T_BUG \
 		$(top_srcdir)/extras/gudev/gudev.h \
 		$(top_srcdir)/extras/gudev/gudevtypes.h \
 		$(top_srcdir)/extras/gudev/gudevenums.h \
-		$(or $(wildcard $(top_srcdir)/extras/gudev/gudevenumtypes.h),$(top_builddir)/extras/gudev/gudevenumtypes.h) \
+		$(or $(wildcard $(top_builddir)/extras/gudev/gudevenumtypes.h),$(top_srcdir)/extras/gudev/gudevenumtypes.h) \
 		$(top_srcdir)/extras/gudev/gudevclient.h \
 		$(top_srcdir)/extras/gudev/gudevdevice.h \
 		$(top_srcdir)/extras/gudev/gudevclient.c \