From: Kay Sievers Date: Thu, 3 Dec 2009 12:58:18 +0000 (+0100) Subject: really really fix both in-tree and out-of-tree builds X-Git-Tag: 174~686 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83d288085fe1203a0bbfd2bd4d2486eb38699f7f;p=systemd really really fix both in-tree and out-of-tree builds The include is still missing: GEN extras/gudev/GUdev-1.0.gir In file included from :4: /home/kay/work/src/udev/extras/gudev/gudev.h:26:34: error: gudev/gudevenumtypes.h: No such file or directory Also prepend $(builddir). --- diff --git a/Makefile.am b/Makefile.am index 4dfab563..83ecb745 100644 --- a/Makefile.am +++ b/Makefile.am @@ -384,12 +384,13 @@ extras/gudev/GUdev-1.0.gir: extras/gudev/libgudev-1.0.la $(G_IR_SCANNER) Makefil --pkg=glib-2.0 \ --pkg=gobject-2.0 \ -I$(top_srcdir)/extras \ + -I$(top_builddir)/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 extras/gudev/gudevenumtypes.h),$(top_srcdir)/extras/gudev/gudevenumtypes.h) \ + $(or $(wildcard $(top_srcdir)/extras/gudev/gudevenumtypes.h),$(top_builddir)/extras/gudev/gudevenumtypes.h) \ $(top_srcdir)/extras/gudev/gudevclient.h \ $(top_srcdir)/extras/gudev/gudevdevice.h \ $(top_srcdir)/extras/gudev/gudevclient.c \