From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1W4YmZ-0006Nu-VK for mharc-grub-devel@gnu.org; Sat, 18 Jan 2014 11:30:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44341) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W4YmT-0006Fp-P5 for grub-devel@gnu.org; Sat, 18 Jan 2014 11:30:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W4YmK-0004ij-2T for grub-devel@gnu.org; Sat, 18 Jan 2014 11:29:57 -0500 Received: from mail-ee0-x235.google.com ([2a00:1450:4013:c00::235]:52977) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W4YmJ-0004if-O2 for grub-devel@gnu.org; Sat, 18 Jan 2014 11:29:48 -0500 Received: by mail-ee0-f53.google.com with SMTP id t10so2611863eei.26 for ; Sat, 18 Jan 2014 08:29:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject:references :in-reply-to:content-type; bh=fEJ74DggRaH0TWdrnJYiy5Tvf86bLXhJecRDEbnLbKo=; b=FgAexiOORF0iOBi3LRTy0Vqt6pgrXct1bnt4CCCsqVRDY/+elkev6y4m9CkROGVdX/ 1gmdzjj+Gl0tRKgNPD33c+I1Z9VlbR6k3VwxZOnDryKegcBtxUHw+nhW/p8KOQ82KCZr vHUa90B0ngoP92s0KcjilPn/wJd0chPMn8u6x+YDofu6oNdA1GV9ws4yqiZxykG2EDz4 onRsStL/25ECvalAXD965xfuMWGWXvgjp6LNoDiT0HgyN+Cfez4vXQg43FTg14VmxAYf op69wHFqeZCoFx334PKepLkMuJinZKKAA0NJLFGhuE/clrrk5HAfuYoyNkfBS6vfoUvg gVmg== X-Received: by 10.14.69.200 with SMTP id n48mr8670241eed.54.1390062586961; Sat, 18 Jan 2014 08:29:46 -0800 (PST) Received: from [192.168.1.16] (85-188.196-178.cust.bluewin.ch. [178.196.188.85]) by mx.google.com with ESMTPSA id u7sm36460430eep.11.2014.01.18.08.29.44 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 18 Jan 2014 08:29:46 -0800 (PST) Message-ID: <52DAABF7.9010705@gmail.com> Date: Sat, 18 Jan 2014 17:29:43 +0100 From: =?UTF-8?B?VmxhZGltaXIgJ8+GLWNvZGVyL3BoY29kZXInIFNlcmJpbmVua28=?= User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Icedove/24.2.0 MIME-Version: 1.0 To: The development of GNU GRUB Subject: Re: [PATCH] add BUILD_EXEEXT support to fix make clean on Windows References: <1390062029-16117-1-git-send-email-arvidjaar@gmail.com> In-Reply-To: <1390062029-16117-1-git-send-email-arvidjaar@gmail.com> X-Enigmail-Version: 1.6 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="qnOp1IhNJttr3AD02kv73QUG2uSPXT354" X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4013:c00::235 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Jan 2014 16:30:03 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --qnOp1IhNJttr3AD02kv73QUG2uSPXT354 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Go ahead. On 18.01.2014 17:20, Andrey Borzenkov wrote: > Add $(BUILD_EXEEXT) to ensure files are removed. Also add CLEANFILES wh= ere > appropriate. >=20 > --- > Makefile.am | 16 ++++++++-------- > Makefile.util.def | 2 +- > configure.ac | 21 ++++++++++++++++----- > grub-core/Makefile.am | 14 ++++++++------ > 4 files changed, 33 insertions(+), 20 deletions(-) >=20 > diff --git a/Makefile.am b/Makefile.am > index 1bbec0e..aa526f5 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -66,22 +66,22 @@ endif > =20 > starfield_theme_files =3D $(srcdir)/themes/starfield/blob_w.png $(srcd= ir)/themes/starfield/boot_menu_c.png $(srcdir)/themes/starfield/boot_menu= _e.png $(srcdir)/themes/starfield/boot_menu_ne.png $(srcdir)/themes/starf= ield/boot_menu_n.png $(srcdir)/themes/starfield/boot_menu_nw.png $(srcdir= )/themes/starfield/boot_menu_se.png $(srcdir)/themes/starfield/boot_menu_= s.png $(srcdir)/themes/starfield/boot_menu_sw.png $(srcdir)/themes/starfi= eld/boot_menu_w.png $(srcdir)/themes/starfield/slider_c.png $(srcdir)/the= mes/starfield/slider_n.png $(srcdir)/themes/starfield/slider_s.png $(srcd= ir)/themes/starfield/starfield.png $(srcdir)/themes/starfield/terminal_bo= x_c.png $(srcdir)/themes/starfield/terminal_box_e.png $(srcdir)/themes/st= arfield/terminal_box_ne.png $(srcdir)/themes/starfield/terminal_box_n.png= $(srcdir)/themes/starfield/terminal_box_nw.png $(srcdir)/themes/starfiel= d/terminal_box_se.png $(srcdir)/themes/starfield/terminal_box_s.png $(src= dir)/themes/starfield/terminal_box_sw.png $(srcdir)/ themes/starfield/terminal_box_w.png $(srcdir)/themes/starfield/theme.txt = $(srcdir)/themes/starfield/README $(srcdir)/themes/starfield/COPYING.CC-B= Y-SA-3.0 > =20 > -build-grub-mkfont: util/grub-mkfont.c grub-core/unidata.c grub-core/ke= rn/emu/misc.c util/misc.c > +build-grub-mkfont$(BUILD_EXEEXT): util/grub-mkfont.c grub-core/unidata= =2Ec grub-core/kern/emu/misc.c util/misc.c > $(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPP= FLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=3D1 -DGRUB_BUILD=3D1 -DGRUB_UTIL=3D= 1 -DGRUB_BUILD_PROGRAM_NAME=3D\"build-grub-mkfont\" $^ $(build_freetype_c= flags) $(build_freetype_libs) > -CLEANFILES +=3D build-grub-mkfont > +CLEANFILES +=3D build-grub-mkfont$(BUILD_EXEEXT) > =20 > -garbage-gen: util/garbage-gen.c > +garbage-gen$(BUILD_EXEEXT): util/garbage-gen.c > $(BUILD_CC) -o $@ $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) = $^ > -CLEANFILES +=3D garbage-gen > +CLEANFILES +=3D garbage-gen$(BUILD_EXEEXT) > EXTRA_DIST +=3D util/garbage-gen.c > =20 > -build-grub-gen-asciih: util/grub-gen-asciih.c > +build-grub-gen-asciih$(BUILD_EXEEXT): util/grub-gen-asciih.c > $(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPP= FLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=3D1 -DGRUB_BUILD=3D1 -DGRUB_UTIL=3D= 1 $^ $(build_freetype_cflags) $(build_freetype_libs) -Wall -Werror > -CLEANFILES +=3D build-grub-gen-asciih > +CLEANFILES +=3D build-grub-gen-asciih$(BUILD_EXEEXT) > =20 > -build-grub-gen-widthspec: util/grub-gen-widthspec.c > +build-grub-gen-widthspec$(BUILD_EXEEXT): util/grub-gen-widthspec.c > $(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPP= FLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=3D1 -DGRUB_BUILD=3D1 -DGRUB_UTIL=3D= 1 $^ $(build_freetype_cflags) $(build_freetype_libs) -Wall -Werror > -CLEANFILES +=3D build-grub-gen-widthspec > +CLEANFILES +=3D build-grub-gen-widthspec$(BUILD_EXEEXT) > =20 > if COND_STARFIELD > starfield_DATA =3D dejavu_10.pf2 dejavu_12.pf2 dejavu_bold_14.pf2 deja= vu_14.pf2 dejavu_16.pf2 $(starfield_theme_files) > diff --git a/Makefile.util.def b/Makefile.util.def > index 3c99be2..83df212 100644 > --- a/Makefile.util.def > +++ b/Makefile.util.def > @@ -708,7 +708,7 @@ script =3D { > name =3D grub-fs-tester; > common =3D tests/util/grub-fs-tester.in; > installdir =3D noinst; > - dependencies =3D garbage-gen; > + dependencies =3D 'garbage-gen$(BUILD_EXEEXT)'; > }; > =20 > script =3D { > diff --git a/configure.ac b/configure.ac > index 2e4cf3c..cf3de3b 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -38,7 +38,8 @@ AC_CONFIG_AUX_DIR([build-aux]) > # We don't want -g -O2 by default in CFLAGS > : ${CFLAGS=3D""} > =20 > -# Checks for host and target systems. > +# Checks for build, host and target systems. > +AC_CANONICAL_BUILD > AC_CANONICAL_HOST > save_program_prefix=3D"${program_prefix}" > AC_CANONICAL_TARGET > @@ -422,6 +423,16 @@ case "$build_os" in > haiku*) BUILD_LIBM=3D ;; > *) BUILD_LIBM=3D-lm ;; > esac > + > +dnl FIXME proper test seems to require too deep dive into Autoconf int= ernals. > +dnl For now just list known platforms that we support. > + > +case "$build_os" in > + cygwin*|mingw32*|mingw64*) BUILD_EXEEXT=3D.exe ;; > + *) BUILD_EXEEXT=3D ;; > +esac > +AC_SUBST(BUILD_EXEEXT) > + > # For gnulib. > gl_INIT > =20 > @@ -765,11 +776,11 @@ if test x"$platform" =3D xemu ; then > *windows* | *cygwin* | *mingw*) > if test x${target_cpu} =3D xi386 ; then > grub_cv_target_cc_link_format=3D-mi386pe; > - TARGET_OBJ2ELF=3D'./build-grub-pe2elf'; > + TARGET_OBJ2ELF=3D'./build-grub-pe2elf$(BUILD_EXEEXT)'; > fi > if test x${target_cpu} =3D xx86_64 ; then > grub_cv_target_cc_link_format=3D-mi386pep; > - TARGET_OBJ2ELF=3D'./build-grub-pep2elf'; > + TARGET_OBJ2ELF=3D'./build-grub-pep2elf$(BUILD_EXEEXT)'; > fi > TARGET_LDFLAGS=3D"$TARGET_LDFLAGS -Wl,$grub_cv_target_cc_link_fo= rmat" > ;; > @@ -803,10 +814,10 @@ elif test x"$target_cpu" =3D xi386 || test x"$tar= get_cpu" =3D xx86_64; then > fi > TARGET_LDFLAGS=3D"$TARGET_LDFLAGS -Wl,$grub_cv_target_cc_link_format= " > if test x"$grub_cv_target_cc_link_format" =3D x-mi386pe ; then > - TARGET_OBJ2ELF=3D'./build-grub-pe2elf'; > + TARGET_OBJ2ELF=3D'./build-grub-pe2elf$(BUILD_EXEEXT)'; > fi > if test x"$grub_cv_target_cc_link_format" =3D x-mi386pep ; then > - TARGET_OBJ2ELF=3D'./build-grub-pep2elf'; > + TARGET_OBJ2ELF=3D'./build-grub-pep2elf$(BUILD_EXEEXT)'; > fi > fi > =20 > diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am > index 13b7979..826b3dd 100644 > --- a/grub-core/Makefile.am > +++ b/grub-core/Makefile.am > @@ -26,20 +26,22 @@ CFLAGS_LIBRARY +=3D $(CFLAGS_PLATFORM) -fno-builtin= > CPPFLAGS_LIBRARY +=3D $(CPPFLAGS_PLATFORM) > CCASFLAGS_LIBRARY +=3D $(CCASFLAGS_PLATFORM) > =20 > -build-grub-pep2elf: $(top_srcdir)/util/grub-pe2elf.c $(top_srcdir)/gru= b-core/kern/emu/misc.c $(top_srcdir)/util/misc.c > +build-grub-pep2elf$(BUILD_EXEEXT): $(top_srcdir)/util/grub-pe2elf.c $(= top_srcdir)/grub-core/kern/emu/misc.c $(top_srcdir)/util/misc.c > $(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPP= FLAGS) $(BUILD_LDFLAGS) -DGRUB_BUILD=3D1 -DGRUB_TARGET_WORDSIZE=3D64 -DGR= UB_UTIL=3D1 -DGRUB_BUILD_PROGRAM_NAME=3D\"build-grub-pep2elf\" $^ > +CLEANFILES +=3D build-grub-pep2elf$(BUILD_EXEEXT) > =20 > -build-grub-pe2elf: $(top_srcdir)/util/grub-pe2elf.c $(top_srcdir)/grub= -core/kern/emu/misc.c $(top_srcdir)/util/misc.c > +build-grub-pe2elf$(BUILD_EXEEXT): $(top_srcdir)/util/grub-pe2elf.c $(t= op_srcdir)/grub-core/kern/emu/misc.c $(top_srcdir)/util/misc.c > $(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPP= FLAGS) $(BUILD_LDFLAGS) -DGRUB_BUILD=3D1 -DGRUB_TARGET_WORDSIZE=3D32 -DGR= UB_UTIL=3D1 -DGRUB_BUILD_PROGRAM_NAME=3D\"build-grub-pe2elf\" $^ > +CLEANFILES +=3D build-grub-pe2elf$(BUILD_EXEEXT) > =20 > # gentrigtables > -gentrigtables: gentrigtables.c > +gentrigtables$(BUILD_EXEEXT): gentrigtables.c > $(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPP= FLAGS) $(BUILD_LDFLAGS) $< $(BUILD_LIBM) > -CLEANFILES +=3D gentrigtables > +CLEANFILES +=3D gentrigtables$(BUILD_EXEEXT) > =20 > # trigtables.c > -trigtables.c: gentrigtables gentrigtables.c $(top_srcdir)/configure.ac= > - ./gentrigtables > $@ > +trigtables.c: gentrigtables$(BUILD_EXEEXT) gentrigtables.c $(top_srcdi= r)/configure.ac > + ./gentrigtables$(BUILD_EXEEXT) > $@ > CLEANFILES +=3D trigtables.c > =20 > # XXX Use Automake's LEX & YACC support >=20 --qnOp1IhNJttr3AD02kv73QUG2uSPXT354 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 Comment: Using GnuPG with Icedove - http://www.enigmail.net/ iF4EAREKAAYFAlLaq/cACgkQmBXlbbo5nOtt0AD/TKf58t1vQUMS9wTSdQFXArFq VJKlC+V2/DVOCEnY2CcA/3G6V6o2eyaEc2MHu4DaEfB8//ayK1NWnsqFlpXZyjDw =vM84 -----END PGP SIGNATURE----- --qnOp1IhNJttr3AD02kv73QUG2uSPXT354--