* [PATCH] Makefile cleanup
@ 2005-10-04 19:32 Michal Ostrowski
2005-10-05 10:26 ` Keir Fraser
0 siblings, 1 reply; 5+ messages in thread
From: Michal Ostrowski @ 2005-10-04 19:32 UTC (permalink / raw)
To: xen-devel
[-- Attachment #1.1: Type: text/plain, Size: 566 bytes --]
changeset: 7196:73e930d47aff
user: mostrows@heater.watson.ibm.com
date: Tue Oct 4 11:35:49 2005 -0400
summary: Fix missing setting of XEN_ROOT in Makefile.
Signed-off-by: Michal Ostrowski <mostrows@watson.ibm.com>
diff -r ec84b119e4ed -r 73e930d47aff xen/Rules.mk
--- a/xen/Rules.mk Tue Oct 4 15:02:51 2005 +0100
+++ b/xen/Rules.mk Tue Oct 4 11:35:49 2005 -0400
@@ -10,6 +10,8 @@
domu_debug ?= n
crash_debug ?= n
+
+XEN_ROOT=$(BASEDIR)/..
include $(BASEDIR)/../Config.mk
# Set ARCH/SUBARCH appropriately.
[-- Attachment #1.2: Type: application/pgp-signature, Size: 189 bytes --]
[-- Attachment #2: Type: text/plain, Size: 138 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Makefile cleanup
2005-10-04 19:32 [PATCH] Makefile cleanup Michal Ostrowski
@ 2005-10-05 10:26 ` Keir Fraser
0 siblings, 0 replies; 5+ messages in thread
From: Keir Fraser @ 2005-10-05 10:26 UTC (permalink / raw)
To: Michal Ostrowski; +Cc: xen-devel
On 4 Oct 2005, at 20:32, Michal Ostrowski wrote:
> changeset: 7196:73e930d47aff
> user: mostrows@heater.watson.ibm.com
> date: Tue Oct 4 11:35:49 2005 -0400
> summary: Fix missing setting of XEN_ROOT in Makefile.
>
> Signed-off-by: Michal Ostrowski <mostrows@watson.ibm.com>
Only certain tools subdirs use a XEN_ROOT variable. There's no need to
set it in the xen subdir.
-- Keir
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] Makefile cleanup.
@ 2005-10-04 19:35 Michal Ostrowski
0 siblings, 0 replies; 5+ messages in thread
From: Michal Ostrowski @ 2005-10-04 19:35 UTC (permalink / raw)
To: xen-devel
[-- Attachment #1.1: Type: text/plain, Size: 2248 bytes --]
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-directory.
Allow for users to include a ".config" with additional custom settings.
Signed-off-by: Michal Ostrowski <mostrows@watson.ibm.com>
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
# Currently supported architectures: x86_32, x86_64
XEN_COMPILE_ARCH ?= $(shell uname -m | sed -e s/i.86/x86_32/)
@@ -19,6 +21,16 @@
STRIP = $(CROSS_COMPILE)strip
OBJCOPY = $(CROSS_COMPILE)objcopy
OBJDUMP = $(CROSS_COMPILE)objdump
+
+# Default is to install to local 'dist' directory.
+DISTDIR ?= $(XEN_ROOT)/dist
+DESTDIR ?= $(DISTDIR)/install
+
+INSTALL := install
+INSTALL_DIR := $(INSTALL) -d -m0755
+INSTALL_DATA := $(INSTALL) -m0644
+INSTALL_PROG := $(INSTALL) -m0755
+
ifeq ($(XEN_TARGET_ARCH),x86_64)
LIBDIR = 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 ?= $(CURDIR)/dist
-DESTDIR ?= $(DISTDIR)/install
-
-INSTALL := install
-INSTALL_DIR := $(INSTALL) -d -m0755
-INSTALL_DATA := $(INSTALL) -m0644
-INSTALL_PROG := $(INSTALL) -m0755
KERNELS ?= 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=*2.4*
XKERNELS := $(foreach kernel, $(KERNELS), $(patsubst buildconfigs/mk.%,%,$(wildcard buildconfigs/mk.$(kernel))) )
-
-export DESTDIR
# 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
+XEN_ROOT=$(CURDIR)
include Config.mk
include buildconfigs/Rules.mk
[-- Attachment #1.2: Type: application/pgp-signature, Size: 189 bytes --]
[-- Attachment #2: Type: text/plain, Size: 138 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH] Makefile cleanup
@ 2006-07-28 17:59 Martin Langer
2006-08-01 16:01 ` Takashi Iwai
0 siblings, 1 reply; 5+ messages in thread
From: Martin Langer @ 2006-07-28 17:59 UTC (permalink / raw)
To: alsa-devel
Let's remove an miro dependency from alsa-driver, because miro is a part
of alsa-kernel now.
Signed-off-by: Martin Langer <martin-langer@gmx.de>
--- alsa-driver/isa/cs423x/Makefile.ORIGINAL 2006-07-28 19:41:16.000000000 +0200
+++ alsa-driver/isa/cs423x/Makefile 2006-07-28 19:41:31.000000000 +0200
@@ -13,6 +13,5 @@
snd-pc98-cs4232-objs := pc98.o
obj-$(CONFIG_SND_PC98_CS4232) += snd-pc98-cs4232.o snd-cs4231-lib.o
-obj-$(CONFIG_SND_MIRO) += snd-cs4231-lib.o
include $(SND_TOPDIR)/Rules.make
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Makefile cleanup
2006-07-28 17:59 Martin Langer
@ 2006-08-01 16:01 ` Takashi Iwai
0 siblings, 0 replies; 5+ messages in thread
From: Takashi Iwai @ 2006-08-01 16:01 UTC (permalink / raw)
To: Martin Langer; +Cc: alsa-devel
At Fri, 28 Jul 2006 19:59:38 +0200,
Martin Langer wrote:
>
> Let's remove an miro dependency from alsa-driver, because miro is a part
> of alsa-kernel now.
>
> Signed-off-by: Martin Langer <martin-langer@gmx.de>
Applied to HG tree. Thanks.
Takashi
>
> --- alsa-driver/isa/cs423x/Makefile.ORIGINAL 2006-07-28 19:41:16.000000000 +0200
> +++ alsa-driver/isa/cs423x/Makefile 2006-07-28 19:41:31.000000000 +0200
> @@ -13,6 +13,5 @@
>
> snd-pc98-cs4232-objs := pc98.o
> obj-$(CONFIG_SND_PC98_CS4232) += snd-pc98-cs4232.o snd-cs4231-lib.o
> -obj-$(CONFIG_SND_MIRO) += snd-cs4231-lib.o
>
> include $(SND_TOPDIR)/Rules.make
>
>
> -------------------------------------------------------------------------
> Take Surveys. Earn Cash. Influence the Future of IT
> Join SourceForge.net's Techsay panel and you'll get the chance to share your
> opinions on IT & business topics through brief surveys -- and earn cash
> http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/alsa-devel
>
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2006-08-01 16:01 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-10-04 19:32 [PATCH] Makefile cleanup Michal Ostrowski
2005-10-05 10:26 ` Keir Fraser
-- strict thread matches above, loose matches on Subject: below --
2005-10-04 19:35 Michal Ostrowski
2006-07-28 17:59 Martin Langer
2006-08-01 16:01 ` Takashi Iwai
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.