From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michal Ostrowski Subject: [PATCH] Makefile cleanup. Date: Tue, 4 Oct 2005 15:35:36 -0400 Message-ID: <20051004153536.15c33e11@brick.watson.ibm.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1275328594==" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Mime-version: 1.0 Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org --===============1275328594== Content-Type: multipart/signed; boundary=Signature_Tue__4_Oct_2005_15_35_36_-0400_wA_QrsNd2NB3TKMR; protocol="application/pgp-signature"; micalg=pgp-sha1 --Signature_Tue__4_Oct_2005_15_35_36_-0400_wA_QrsNd2NB3TKMR Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable changeset: 7197:c092fbcc18c6 user: mostrows@heater.watson.ibm.com date: Tue Oct 4 11:45:05 2005 -0400 summary: Move setting of configuration variables to Config.mk. Allows for partial-tree builds to be invoked from a sub-direct= ory. Allow for users to include a ".config" with additional custom setting= s.=09 Signed-off-by: Michal Ostrowski diff -r 73e930d47aff -r c092fbcc18c6 Config.mk --- a/Config.mk Tue Oct 4 11:35:49 2005 -0400 +++ b/Config.mk Tue Oct 4 11:45:05 2005 -0400 @@ -1,4 +1,6 @@ # -*- mode: Makefile; -*- + +-include $(XEN_ROOT)/.config =20 # Currently supported architectures: x86_32, x86_64 XEN_COMPILE_ARCH ?=3D $(shell uname -m | sed -e s/i.86/x86_32/) @@ -19,6 +21,16 @@ STRIP =3D $(CROSS_COMPILE)strip OBJCOPY =3D $(CROSS_COMPILE)objcopy OBJDUMP =3D $(CROSS_COMPILE)objdump + +# Default is to install to local 'dist' directory. +DISTDIR ?=3D $(XEN_ROOT)/dist +DESTDIR ?=3D $(DISTDIR)/install + +INSTALL :=3D install +INSTALL_DIR :=3D $(INSTALL) -d -m0755 +INSTALL_DATA :=3D $(INSTALL) -m0644 +INSTALL_PROG :=3D $(INSTALL) -m0755 + =20 ifeq ($(XEN_TARGET_ARCH),x86_64) LIBDIR =3D lib64 diff -r 73e930d47aff -r c092fbcc18c6 Makefile --- a/Makefile Tue Oct 4 11:35:49 2005 -0400 +++ b/Makefile Tue Oct 4 11:45:05 2005 -0400 @@ -1,23 +1,12 @@ # # Grand Unified Makefile for Xen. # - -# Default is to install to local 'dist' directory. -DISTDIR ?=3D $(CURDIR)/dist -DESTDIR ?=3D $(DISTDIR)/install - -INSTALL :=3D install -INSTALL_DIR :=3D $(INSTALL) -d -m0755 -INSTALL_DATA :=3D $(INSTALL) -m0644 -INSTALL_PROG :=3D $(INSTALL) -m0755 =20 KERNELS ?=3D linux-2.6-xen0 linux-2.6-xenU # linux-2.4-xen0 linux-2.4-xenU netbsd-2.0-xenU # You may use wildcards in the above e.g. KERNELS=3D*2.4* =20 XKERNELS :=3D $(foreach kernel, $(KERNELS), $(patsubst buildconfigs/mk.%,%= ,$(wildcard buildconfigs/mk.$(kernel))) ) - -export DESTDIR =20 # Export target architecture overrides to Xen and Linux sub-trees. ifneq ($(XEN_TARGET_ARCH),) @@ -28,6 +17,7 @@ # Default target must appear before any include lines all: dist =20 +XEN_ROOT=3D$(CURDIR) include Config.mk include buildconfigs/Rules.mk =20 --Signature_Tue__4_Oct_2005_15_35_36_-0400_wA_QrsNd2NB3TKMR Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.5 (GNU/Linux) iD8DBQFDQtmIDMDCqU5zPMARAomLAJ9Xiu0CGuJRvrzpXHfVclZ2GxiTOACgm87M vlblsrkFbaGtgeD80vJIv3Y= =48pk -----END PGP SIGNATURE----- --Signature_Tue__4_Oct_2005_15_35_36_-0400_wA_QrsNd2NB3TKMR-- --===============1275328594== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --===============1275328594==--