direct-io.hg

changeset 9321:9795d9407acc

Apply Xen build system changes to all non-arch subdirectories.

Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Sun Mar 19 14:02:18 2006 +0100 (2006-03-19)
parents f513384a18ee
children 768936b2800a
files xen/Post.mk xen/Rules.mk xen/acm/Makefile xen/common/Makefile xen/drivers/acpi/Makefile xen/drivers/char/Makefile
line diff
     1.1 --- a/xen/Post.mk	Sun Mar 19 13:13:35 2006 +0100
     1.2 +++ b/xen/Post.mk	Sun Mar 19 14:02:18 2006 +0100
     1.3 @@ -1,15 +1,19 @@
     1.4  
     1.5  subdirs-all := $(subdirs-y) $(subdirs-n)
     1.6  
     1.7 -default: $(subdirs-y)
     1.8 +obj-y += $(patsubst %,%/built_in.o,$(subdirs-y))
     1.9 +
    1.10 +default: built_in.o
    1.11 +built_in.o: $(obj-y)
    1.12 +	$(LD) $(LDFLAGS) -r -o $@ $^
    1.13  
    1.14  .PHONY: FORCE
    1.15  FORCE:
    1.16  
    1.17 -%/: FORCE
    1.18 +%/built_in.o: FORCE
    1.19  	$(MAKE) -C $*
    1.20  
    1.21  clean: $(addprefix _clean_, $(subdirs-all))
    1.22 +	rm -f *.o *~ core
    1.23  _clean_%/: FORCE
    1.24  	$(MAKE) -C $* clean
    1.25 -
     2.1 --- a/xen/Rules.mk	Sun Mar 19 13:13:35 2006 +0100
     2.2 +++ b/xen/Rules.mk	Sun Mar 19 14:02:18 2006 +0100
     2.3 @@ -41,18 +41,12 @@ S_SRCS  := $(wildcard *.S)
     2.4  OBJS    := $(patsubst %.S,%.o,$(S_SRCS))
     2.5  OBJS    += $(patsubst %.c,%.o,$(C_SRCS))
     2.6  
     2.7 -ALL_OBJS-y :=
     2.8 -CFLAGS-y   :=
     2.9 -subdirs-y  :=
    2.10 -subdirs-n  :=
    2.11 -
    2.12  include $(BASEDIR)/arch/$(TARGET_ARCH)/Rules.mk
    2.13  
    2.14  # Note that link order matters!
    2.15 -ALL_OBJS-y               += $(BASEDIR)/common/common.o
    2.16 -ALL_OBJS-y               += $(BASEDIR)/drivers/char/driver.o
    2.17 -ALL_OBJS-$(HAS_ACPI)     += $(BASEDIR)/drivers/acpi/driver.o
    2.18 -ALL_OBJS-$(ACM_SECURITY) += $(BASEDIR)/acm/acm.o
    2.19 +ALL_OBJS-y               += $(BASEDIR)/common/built_in.o
    2.20 +ALL_OBJS-y               += $(BASEDIR)/drivers/built_in.o
    2.21 +ALL_OBJS-$(ACM_SECURITY) += $(BASEDIR)/acm/built_in.o
    2.22  ALL_OBJS-y               += $(BASEDIR)/arch/$(TARGET_ARCH)/arch.o
    2.23  
    2.24  CFLAGS-y               += -g -D__XEN__
     3.1 --- a/xen/acm/Makefile	Sun Mar 19 13:13:35 2006 +0100
     3.2 +++ b/xen/acm/Makefile	Sun Mar 19 14:02:18 2006 +0100
     3.3 @@ -1,15 +1,9 @@
     3.4 -
     3.5  include $(BASEDIR)/Rules.mk
     3.6 -OBJS =  acm_core.o 
     3.7 -OBJS += acm_policy.o
     3.8 -OBJS += acm_simple_type_enforcement_hooks.o
     3.9 -OBJS += acm_chinesewall_hooks.o
    3.10 -OBJS += acm_null_hooks.o
    3.11  
    3.12 -default: acm.o
    3.13 +obj-y += acm_core.o 
    3.14 +obj-y += acm_policy.o
    3.15 +obj-y += acm_simple_type_enforcement_hooks.o
    3.16 +obj-y += acm_chinesewall_hooks.o
    3.17 +obj-y += acm_null_hooks.o
    3.18  
    3.19 -acm.o: $(OBJS)
    3.20 -	$(LD) $(LDFLAGS) -r -o acm.o $(OBJS)
    3.21 -
    3.22 -clean:
    3.23 -	rm -f *.o *~ core
    3.24 +include $(BASEDIR)/Post.mk
     4.1 --- a/xen/common/Makefile	Sun Mar 19 13:13:35 2006 +0100
     4.2 +++ b/xen/common/Makefile	Sun Mar 19 14:02:18 2006 +0100
     4.3 @@ -1,19 +1,35 @@
     4.4  
     4.5  include $(BASEDIR)/Rules.mk
     4.6  
     4.7 -ifneq ($(perfc),y)
     4.8 -OBJS := $(subst perfc.o,,$(OBJS))
     4.9 -endif
    4.10 -ifneq ($(crash_debug),y)
    4.11 -OBJS := $(patsubst gdbstub.o,,$(OBJS))
    4.12 -endif
    4.13 +obj-y += acm_ops.o
    4.14 +obj-y += bitmap.o
    4.15 +obj-y += dom0_ops.o
    4.16 +obj-y += domain.o
    4.17 +obj-y += elf.o
    4.18 +obj-y += event_channel.o
    4.19 +obj-y += grant_table.o
    4.20 +obj-y += kernel.o
    4.21 +obj-y += keyhandler.o
    4.22 +obj-y += lib.o
    4.23 +obj-y += memory.o
    4.24 +obj-y += multicall.o
    4.25 +obj-y += page_alloc.o
    4.26 +obj-y += rangeset.o
    4.27 +obj-y += sched_bvt.o
    4.28 +obj-y += sched_sedf.o
    4.29 +obj-y += schedule.o
    4.30 +obj-y += softirq.o
    4.31 +obj-y += string.o
    4.32 +obj-y += symbols.o
    4.33 +obj-y += trace.o
    4.34 +obj-y += timer.o
    4.35 +obj-y += vsprintf.o
    4.36 +obj-y += xmalloc.o
    4.37  
    4.38 -default: common.o
    4.39 -common.o: $(OBJS)
    4.40 -	$(LD) $(LDFLAGS) -r -o common.o $(OBJS)
    4.41 +obj-$(perfc)       += perfc.o
    4.42 +obj-$(crash_debug) += gdbstub.o
    4.43  
    4.44 -clean:
    4.45 -	rm -f *.o *~ core
    4.46 +include $(BASEDIR)/Post.mk
    4.47  
    4.48  # Object file contains changeset and compiler information.
    4.49  kernel.o: $(BASEDIR)/include/xen/compile.h
     5.1 --- a/xen/drivers/acpi/Makefile	Sun Mar 19 13:13:35 2006 +0100
     5.2 +++ b/xen/drivers/acpi/Makefile	Sun Mar 19 14:02:18 2006 +0100
     5.3 @@ -1,11 +1,5 @@
     5.4 -
     5.5  include $(BASEDIR)/Rules.mk
     5.6  
     5.7 -OBJS := tables.o
     5.8 +obj-y += tables.o
     5.9  
    5.10 -default: driver.o
    5.11 -driver.o: $(OBJS)
    5.12 -	$(LD) $(LDFLAGS) -r -o driver.o $(OBJS)
    5.13 -
    5.14 -clean:
    5.15 -	rm -f *.o *~ core
    5.16 +include $(BASEDIR)/Post.mk
     6.1 --- a/xen/drivers/char/Makefile	Sun Mar 19 13:13:35 2006 +0100
     6.2 +++ b/xen/drivers/char/Makefile	Sun Mar 19 14:02:18 2006 +0100
     6.3 @@ -1,12 +1,10 @@
     6.4 -
     6.5  include $(BASEDIR)/Rules.mk
     6.6  
     6.7 -default: driver.o
     6.8 -driver.o: $(OBJS)
     6.9 -	$(LD) $(LDFLAGS) -r -o driver.o $(OBJS)
    6.10 +obj-y += console.o
    6.11 +obj-y += ns16550.o
    6.12 +obj-y += serial.o
    6.13  
    6.14 -clean:
    6.15 -	rm -f *.o *~ core
    6.16 +include $(BASEDIR)/Post.mk
    6.17  
    6.18  # Object file contains changeset and compiler information.
    6.19  console.o: $(BASEDIR)/include/xen/compile.h