On Thu, May 03, 2007 at 01:14:15PM -0700, H. Peter Anvin wrote:
> Sam Ravnborg wrote:
> > 
> > Would it be OK if we have arch/x86_64/boot present and have stub Makefiles
> > in all directories?
> > If thats OK I can try to cook up something.
> > 
> 
> That's certainly acceptable as an interrim solution.  The right thing
> can wait for the x86 merge, probably.

The general issue with current infrastructure is that we do not
honour $(src) and $(obj) in the implicit rules.
So I added these.

Then next problem is how to set src to the correct value.
For arch/x86_64/boot I could just set it in the make invocation.
For directories below boot/ I do not know yet how to do it.

With patch below and with a one line Makefile in
x86_64/boot thet just included arch/i386/boot/Makefile
I could compile the boot directory.
So not a full solution yet but on the right track.

        Sam

diff --git a/arch/x86_64/Makefile b/arch/x86_64/Makefile
index 2941a91..8c9fc5b 100644
--- a/arch/x86_64/Makefile
+++ b/arch/x86_64/Makefile
@@ -85,7 +85,7 @@ core-$(CONFIG_IA32_EMULATION)         += arch/x86_64/ia32/
 drivers-$(CONFIG_PCI)                  += arch/x86_64/pci/
 drivers-$(CONFIG_OPROFILE)             += arch/x86_64/oprofile/
 
-boot := arch/x86_64/boot
+boot := arch/x86_64/boot src=arch/i386/boot
 
 PHONY += bzImage bzlilo install archmrproper \
         fdimage fdimage144 fdimage288 isoimage archclean
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index e2ad2dc..fb0c117 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -2,7 +2,7 @@
 # Building
 # ==========================================================================
 
-src := $(obj)
+src = $(obj)
 
 PHONY := __build
 __build:
@@ -131,13 +131,13 @@ $(multi-objs-y:.o=.lst) : modname = $(modname-multi)
 quiet_cmd_cc_s_c = CC $(quiet_modtag)  $@
 cmd_cc_s_c       = $(CC) $(c_flags) -fverbose-asm -S -o $@ $<
 
-%.s: %.c FORCE
+$(obj)/%.s: $(src)/%.c FORCE
        $(call if_changed_dep,cc_s_c)
 
 quiet_cmd_cc_i_c = CPP $(quiet_modtag) $@
 cmd_cc_i_c       = $(CPP) $(c_flags)   -o $@ $<
 
-%.i: %.c FORCE
+$(obj)/%.i: $(src)/%.c FORCE
        $(call if_changed_dep,cc_i_c)
 
 quiet_cmd_cc_symtypes_c = SYM $(quiet_modtag) $@
@@ -146,7 +146,7 @@ cmd_cc_symtypes_c      = \
                | $(GENKSYMS) -T $@ >/dev/null;                         \
                test -s $@ || rm -f $@
 
-%.symtypes : %.c FORCE
+$(obj)/%.symtypes : $(src)/%.c FORCE
        $(call if_changed_dep,cc_symtypes_c)
 
 # C (.c) files
@@ -199,13 +199,17 @@ endef
 
 # Built-in and composite module parts
 
-%.o: %.c FORCE
+#%.o: %.c FORCE
+#      $(call cmd,force_checksrc)
+#      $(call if_changed_rule,cc_o_c)
+
+$(obj)/%.o: $(src)/%.c FORCE
        $(call cmd,force_checksrc)
        $(call if_changed_rule,cc_o_c)
 
 # Single-part modules are special since we need to mark them in $(MODVERDIR)
 
-$(single-used-m): %.o: %.c FORCE
+$(single-used-m): $(obj)/%.o: $(src)/%.c FORCE
        $(call cmd,force_checksrc)
        $(call if_changed_rule,cc_o_c)
        @{ echo $(@:.o=.ko); echo $@; } > $(MODVERDIR)/$(@F:.o=.mod)
@@ -215,7 +219,7 @@ quiet_cmd_cc_lst_c = MKLST   $@
                     $(CONFIG_SHELL) $(srctree)/scripts/makelst $*.o \
                                     System.map $(OBJDUMP) > $@
 
-%.lst: %.c FORCE
+$(obj)/%.lst: $(src)/%.c FORCE
        $(call if_changed_dep,cc_lst_c)
 
 # Compile assembler sources (.S)
@@ -229,13 +233,13 @@ $(real-objs-m:.o=.s): modkern_aflags := $(AFLAGS_MODULE)
 quiet_cmd_as_s_S = CPP $(quiet_modtag) $@
 cmd_as_s_S       = $(CPP) $(a_flags)   -o $@ $< 
 
-%.s: %.S FORCE
+$(obj)/%.s: $(src)/%.S FORCE
        $(call if_changed_dep,as_s_S)
 
 quiet_cmd_as_o_S = AS $(quiet_modtag)  $@
 cmd_as_o_S       = $(CC) $(a_flags) -c -o $@ $<
 
-%.o: %.S FORCE
+$(obj)/%.o: $(src)/%.S FORCE
        $(call if_changed_dep,as_o_S)
 
 targets += $(real-objs-y) $(real-objs-m) $(lib-y)
@@ -246,7 +250,7 @@ targets += $(extra-y) $(MAKECMDGOALS) $(always)
 quiet_cmd_cpp_lds_S = LDS     $@
       cmd_cpp_lds_S = $(CPP) $(cpp_flags) -D__ASSEMBLY__ -o $@ $<
 
-%.lds: %.lds.S FORCE
+$(obj)/%.lds: $(src)/%.lds.S FORCE
        $(call if_changed_dep,cpp_lds_S)
 
 # Build the compiled-in targets

-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
kbuild-devel mailing list
kbuild-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kbuild-devel

Reply via email to