even more fixmes/features

[nestedvm.git] / Makefile

diff --git a/Makefile b/Makefile
index 7f30324..f5c2a53 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -78,12 +78,6 @@ $(tasks)/%:
 upstream_clean_%:
        $(MAKE) -C upstream clean_$* usr="$(usr)"
 
-errno_h = $(usr)/mips-unknown-elf/include/sys/errno.h
-$(errno_h): $(tasks)/build_newlib
-
-unistd_h = $(usr)/mips-unknown-elf/include/sys/unistd.h
-$(unistd_h): $(tasks)/build_newlib
-
 #
 # Interpreter/Compiler/Runtime Java Compilation
 #
@@ -190,9 +184,14 @@ unixruntime.jar: $(unixruntime_classes:%=build/org/ibex/nestedvm/%.class)
        cd build && jar cf ../$@ $(unixruntime_classes:%=org/ibex/nestedvm/%*.class)
 
 # This is only for Brian to use... don't mess with it
-rebuild-constants: src/org/ibex/nestedvm/syscalls.h $(errno_h) $(unistd_h)
+rebuild-constants: $(tasks)/build_newlib
        @mkdir -p `dirname $@`
-       cat $^ | ( \
+       ( \
+               cat \
+                       src/org/ibex/nestedvm/syscalls.h \
+                       $(usr)/mips-unknown-elf/include/sys/{errno.h,unistd.h,syslimits.h}; \
+               $(MIPS_CC) -E -dM $(usr)/mips-unknown-elf/include/sys/fcntl.h | awk '$$2 ~ /^[OF]_/ { print; }'; \
+       ) | ( \
                echo "// THIS FILE IS AUTOGENERATED! DO NOT EDIT!"; \
                echo "// run \"make rebuild-constants\" if it needs to be updated"; \
                echo ""; \
@@ -287,12 +286,12 @@ build/tests/DJpeg.mips: $(mips_objects) $(tasks)/build_libjpeg
 # Busybox
 #
 BusyBox_COMPILERFLAGS = -o unixruntime
-build/tests/BusyBox.mips: $(mips_object) $(tasks)/build_busybox
+build/tests/BusyBox.mips: $(mips_objects) $(tasks)/build_busybox
        @mkdir -p `dirname $@`
        cp upstream/build/busybox/busybox $@
        
 busyboxtest: build/tests/BusyBox.class
-       $(JAVA) -cp build tests.BusyBox ash
+       $(JAVA) -cp $(classpath) tests.BusyBox ash
 
 #
 # Boehm GC