summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2009-12-03 14:36:36 +0100
committerKay Sievers <kay.sievers@vrfy.org>2009-12-03 14:36:36 +0100
commitbaf2e222d5c06cb3c4ee7d625e531119d3a999ba (patch)
treeb0fc7c995be67d132767eb382aa87c433ed6a1e2
parent83d288085fe1203a0bbfd2bd4d2486eb38699f7f (diff)
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.
-rw-r--r--Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 83ecb74519..3e9713fc91 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 \