Yes and no, The first one is useful if you stop the patch before the last one. But OK to suppress the first one. Regards, Marc.
2013/9/5 Stefan Schmidt <[email protected]> > Hello. > > > On 09/05/2013 11:15 AM, [email protected] wrote: > >> From: mchalain <[email protected]> >> >> AX_CC_FOR_BUILD set the EXEEXT_FOR_BUILD variable to define the >> application extention of build platform. >> > > This effectively makes patch #1 useless. Any special reason for still > keeping it? If not I would suggest to merge #1 and #5 and reorder the > series if needed. > > regards > Stefan Schmidt > > > src/Makefile.am | 9 +++++---- >> 1 file changed, 5 insertions(+), 4 deletions(-) >> >> diff --git a/src/Makefile.am b/src/Makefile.am >> index 2921041..4b6e1dd 100644 >> --- a/src/Makefile.am >> +++ b/src/Makefile.am >> @@ -38,15 +38,16 @@ pkgconfig_DATA = wayland-client.pc wayland-server.pc >> AM_CPPFLAGS = $(FFI_CFLAGS) >> AM_CFLAGS = $(GCC_CFLAGS) >> CC_FOR_BUILD = @CC_FOR_BUILD@ >> +EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@ >> CCLD_FOR_BUILD = $(CC_FOR_BUILD) >> COMPILE_FOR_BUILD = $(CC_FOR_BUILD) >> >> protocoldir = $(top_srcdir)/protocol >> >> if ENABLE_SCANNER >> -wayland_scanner = $(top_builddir)/src/wayland-**scanner$(EXEEXT) >> +wayland_scanner = $(top_builddir)/src/wayland-** >> scanner$(EXEEXT_FOR_BUILD) >> else >> -wayland_scanner = wayland-scanner$(EXEEXT) >> +wayland_scanner = wayland-scanner$(EXEEXT_FOR_**BUILD) >> endif >> >> include $(top_srcdir)/src/scanner.mk >> @@ -56,7 +57,7 @@ build-%.o : %.c >> $(AM_V_CC)$(COMPILE_FOR_BUILD) -MT $@ -MD -MP -MF >> $(DEPDIR)/build-$*.Tpo -c -o $@ $< >> $(AM_V_at)$(am__mv) $(DEPDIR)/build-$*.Tpo $(DEPDIR)/build-$*.Po >> >> -bin_PROGRAMS = wayland-scanner$(EXEEXT) >> +bin_PROGRAMS = wayland-scanner >> >> wayland_scanner_SOURCES = \ >> build-scanner.c \ >> @@ -65,7 +66,7 @@ wayland_scanner_SOURCES = \ >> wayland_scanner_LDADD = $(EXPAT_LIBS) >> wayland_scanner_LINK = $(CCLD_FOR_BUILD) -o $@ >> >> -$(BUILT_SOURCES) : wayland-scanner$(EXEEXT) >> +$(BUILT_SOURCES) : wayland-scanner$(EXEEXT_FOR_**BUILD) >> >> scannerpkgconfigdir = $(datadir)/pkgconfig >> scannerpkgconfig_DATA = wayland-scanner.pc >> >> >
_______________________________________________ wayland-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/wayland-devel
