| Message ID | 1455205094-24323-1-git-send-email-olaf@aepfle.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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>
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.
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)
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(-)