move extra headers

darcs-hash:20040521085104-24bed-c183b1d263681285509b2502e30ef35c135e278c.gz

diff --git a/Makefile b/Makefile
index 20ca8bf..677899d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -77,7 +77,7 @@ all: build/mips2java$(EXE_EXT) $(mips_objects)
 endif
 
 # HACK: Ensure libc is kept up to date when our mips_objects change
 endif
 
 # HACK: Ensure libc is kept up to date when our mips_objects change

-$(tasks)/build_libc: $(mips_object) upstream/patches/newlib-extraheaders.sh
+$(tasks)/build_libc: $(mips_object) upstream/misc/extraheaders.sh

 
 $(tasks)/%:
        $(MAKE) -C upstream tasks/$* usr="$(usr)" MIPS_LDFLAGS="$(MIPS_LDFLAGS)" MIPS_CFLAGS="$(flags) $(mips_optflags)"
 
 $(tasks)/%:
        $(MAKE) -C upstream tasks/$* usr="$(usr)" MIPS_LDFLAGS="$(MIPS_LDFLAGS)" MIPS_CFLAGS="$(flags) $(mips_optflags)"

diff --git a/upstream/Makefile b/upstream/Makefile
index f78f3ca..d3c840f 100644 (file)
--- a/upstream/Makefile
+++ b/upstream/Makefile
@@ -50,7 +50,7 @@ tasks/build_newlib: tasks/build_gcc
 cross_root := $(usr)/mips-unknown-elf
 libc_a := $(cross_root)/lib/libc.a
 
 cross_root := $(usr)/mips-unknown-elf
 libc_a := $(cross_root)/lib/libc.a
 

-tasks/build_extraheaders: $(upstream)/patches/newlib-extraheaders.sh tasks/build_newlib
+tasks/build_extraheaders: $(upstream)/misc/extraheaders.sh tasks/build_newlib

        # Add extra nestedvm specific headers to include
        cd $(cross_root)/include && sh $<
        touch $@
        # Add extra nestedvm specific headers to include
        cd $(cross_root)/include && sh $<
        touch $@

diff --git a/upstream/patches/newlib-extraheaders.sh b/upstream/misc/extraheaders.sh
similarity index 100%
rename from upstream/patches/newlib-extraheaders.sh
rename to upstream/misc/extraheaders.sh