GNOME Bugzilla – Bug 692176
build: goadaemon - fixes location of goaidentity include.
Last modified: 2013-06-10 16:34:11 UTC
Created attachment 233990 [details] [review] build: goadaemon - fixes location of goaidentity include. goaidentity directory is <top>/src/goaidentity not <top>/goaidentity.
Comment on attachment 233990 [details] [review] build: goadaemon - fixes location of goaidentity include. Looks fine, but I think we can just drop the -I$(top_builddir)/goaidentity because it is not required.
With builddir removed I get: make[4]: Entering directory `/home/prahal/Projects/Devel/Gnome/jhbuild/build/gnome-online-accounts/src/daemon' CC goa_daemon-goadaemon.o In file included from /home/prahal/Projects/Devel/Gnome/jhbuild/gnome/gnome-online-accounts/src/daemon/goadaemon.c:34:0: /home/prahal/Projects/Devel/Gnome/jhbuild/gnome/gnome-online-accounts/src/goaidentity/goaidentityservice.h:30:32: fatal error: org.gnome.Identity.h: No such file or directory #include "org.gnome.Identity.h" ^ compilation terminated. This is with a rm -rf of build/gnome-online-accounts and git clean -dfx of the srcdir (with above patch stripped from the builddir/src/goaidentity ie with this patch instead of the previous one: diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am index 97ad29d..c8d4b1d 100644 --- a/src/daemon/Makefile.am +++ b/src/daemon/Makefile.am @@ -3,8 +3,7 @@ NULL = INCLUDES = \ -I$(top_builddir)/src -I$(top_srcdir)/src \ -I$(top_builddir)/src/goa \ - -I$(top_builddir)/goaidentity \ - -I$(top_srcdir)/goaidentity \ + -I$(top_srcdir)/src/goaidentity \ -DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" \ -DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \ -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\"
Comment on attachment 233990 [details] [review] build: goadaemon - fixes location of goaidentity include. Yes, you are right and thank you very much for the patch.