* [PATCH] tools/console: correct make dependencies for _paths.h
@ 2016-02-11 15:38 Olaf Hering
2016-02-11 16:03 ` Ian Campbell
0 siblings, 1 reply; 3+ messages in thread
From: Olaf Hering @ 2016-02-11 15:38 UTC (permalink / raw)
To: xen-devel
Cc: Wei Liu, Olaf Hering, Ian Jackson, Ian Campbell,
Stefano Stabellini
Correct dependencies for _paths.h to avoid build failure with make -j.
Only main.c requires _paths.h. This fixes commit 8398ec70 ("xenconsole:
Ensure exclusive access to console using locks")
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
---
Should be backported to 4.6
tools/console/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/console/Makefile b/tools/console/Makefile
index 6eeac8f..a7bec75 100644
--- a/tools/console/Makefile
+++ b/tools/console/Makefile
@@ -30,7 +30,8 @@ daemon/io.o: CFLAGS += $(CFLAGS_libxenevtchn) $(CFLAGS_libxengnttab)
xenconsoled: $(patsubst %.c,%.o,$(wildcard daemon/*.c))
$(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS) $(LDLIBS_libxenevtchn) $(LDLIBS_libxengnttab) $(LDLIBS_xenconsoled) $(APPEND_LDFLAGS)
-xenconsole: client/_paths.h $(patsubst %.c,%.o,$(wildcard client/*.c))
+client/main.o: client/_paths.h
+xenconsole: $(patsubst %.c,%.o,$(wildcard client/*.c))
$(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS) $(LDLIBS_xenconsole) $(APPEND_LDFLAGS)
genpath-target = $(call buildmakevars2header,client/_paths.h)
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] tools/console: correct make dependencies for _paths.h
2016-02-11 15:38 [PATCH] tools/console: correct make dependencies for _paths.h Olaf Hering
@ 2016-02-11 16:03 ` Ian Campbell
2016-02-11 17:10 ` Ian Campbell
0 siblings, 1 reply; 3+ messages in thread
From: Ian Campbell @ 2016-02-11 16:03 UTC (permalink / raw)
To: Olaf Hering, xen-devel; +Cc: Ian Jackson, Wei Liu, Stefano Stabellini
On Thu, 2016-02-11 at 15:38 +0000, Olaf Hering wrote:
> Correct dependencies for _paths.h to avoid build failure with make -j.
> Only main.c requires _paths.h. This fixes commit 8398ec70 ("xenconsole:
> Ensure exclusive access to console using locks")
>
> Signed-off-by: Olaf Hering <olaf@aepfle.de>
> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> Cc: Ian Campbell <ian.campbell@citrix.com>
> Cc: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] tools/console: correct make dependencies for _paths.h
2016-02-11 16:03 ` Ian Campbell
@ 2016-02-11 17:10 ` Ian Campbell
0 siblings, 0 replies; 3+ messages in thread
From: Ian Campbell @ 2016-02-11 17:10 UTC (permalink / raw)
To: Olaf Hering, xen-devel; +Cc: Wei Liu, Ian Jackson, Stefano Stabellini
On Thu, 2016-02-11 at 16:03 +0000, Ian Campbell wrote:
> On Thu, 2016-02-11 at 15:38 +0000, Olaf Hering wrote:
> > Correct dependencies for _paths.h to avoid build failure with make -j.
> > Only main.c requires _paths.h. This fixes commit 8398ec70 ("xenconsole:
> > Ensure exclusive access to console using locks")
> >
> > Signed-off-by: Olaf Hering <olaf@aepfle.de>
> > Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> > Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> > Cc: Ian Campbell <ian.campbell@citrix.com>
> > Cc: Wei Liu <wei.liu2@citrix.com>
>
> Acked-by: Ian Campbell <ian.campbell@citrix.com>
and applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-02-11 17:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-11 15:38 [PATCH] tools/console: correct make dependencies for _paths.h Olaf Hering
2016-02-11 16:03 ` Ian Campbell
2016-02-11 17:10 ` Ian Campbell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).