X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=Makefile;h=ee8e94117c6c462a61bf1bf520e76a1a88660826;hp=7f3032497c01a4f92fe676ceaa5aa4201a1eb343;hb=034a42fa65955289442614ef9914e5474fac62aa;hpb=40de2c62cb907622ff6f5fcdbeccc8773a1d7b2d

diff --git a/Makefile b/Makefile
index 7f30324..ee8e941 100644
--- 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,12 @@ 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} \
+	| ( \
 		echo "// THIS FILE IS AUTOGENERATED! DO NOT EDIT!"; \
 		echo "// run \"make rebuild-constants\" if it needs to be updated"; \
 		echo ""; \