[MLton-commit] r4492

[Stephen Weeks]

Moved the stuff that moves files from the runtime to the basis-library
out of the runtime/Makefile and into the main Makefile.  It seems to
be how we generally handle cross-project things.

----------------------------------------------------------------------

U   mlton/branches/on-20050822-x86_64-branch/Makefile
U   mlton/branches/on-20050822-x86_64-branch/runtime/Makefile

----------------------------------------------------------------------

Modified: mlton/branches/on-20050822-x86_64-branch/Makefile
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/Makefile	2006-05-08 20:32:59 UTC (rev 4491)
+++ mlton/branches/on-20050822-x86_64-branch/Makefile	2006-05-08 22:05:37 UTC (rev 4492)
@@ -282,6 +282,10 @@
 	$(MAKE) -C runtime
 	$(CP) include/*.h $(INC)/
 	$(CP) runtime/*.a $(LIB)/$(TARGET)/
+	mv runtime/gen/c-types.sml \
+		basis-library/config/c/$(TARGET_ARCH)-$(TARGET_OS)/c-types.sml	
+	mv runtime/gen/basis-ffi.sml \
+		basis-library/primitive/basis-ffi.sml
 	mkdir -p $(INC)/gc
 	mkdir -p $(INC)/util
 	mkdir -p $(INC)/platform

Modified: mlton/branches/on-20050822-x86_64-branch/runtime/Makefile
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/runtime/Makefile	2006-05-08 20:32:59 UTC (rev 4491)
+++ mlton/branches/on-20050822-x86_64-branch/runtime/Makefile	2006-05-08 22:05:37 UTC (rev 4492)
@@ -211,18 +211,16 @@
 	rm -f c-types.h ml-types.h
 	$(CC) $(OPTCFLAGS) $(WARNCFLAGS) -o gen/gen-types gen/gen-types.c $(UTILOFILES)
 	cd gen && ./gen-types
-	cp gen/c-types.h c-types.h
-	cp gen/c-types.sml ../basis-library/config/c/$(TARGET_ARCH)-$(TARGET_OS)/c-types.sml
-	cp gen/ml-types.h ml-types.h
-	rm -f gen/gen-types gen/c-types.h gen/c-types.sml gen/ml-types.h
+	mv gen/c-types.h c-types.h
+	mv gen/ml-types.h ml-types.h
+	rm -f gen/gen-types
 
 basis-ffi.h: gen/gen-basis-ffi.sml gen/basis-ffi.def
 	rm -f basis-ffi.h
 	cd gen && mlton gen-basis-ffi.sml
 	cd gen && ./gen-basis-ffi 
-	cp gen/basis-ffi.h basis-ffi.h
-	cp gen/basis-ffi.sml ../basis-library/primitive/basis-ffi.sml
-	rm -f gen/gen-basis-ffi gen/basis-ffi.h gen/basis-ffi.sml
+	mv gen/basis-ffi.h basis-ffi.h
+	rm -f gen/gen-basis-ffi
 
 gc-gdb.o: gc.c $(GCCFILES) $(HFILES) 
 	$(CC) $(DEBUGCFLAGS) $(DEBUGWARNCFLAGS) -c -o $@ $<