Merge pull request #280 from dawgfoto/cleanImportDir

move handwritten di files to src

.gitignore

@@ -1,7 +1,7 @@
 doc/*
 lib/*
 obj/*
-import/core/*
+import/*
 druntime.json
 .DS_Store
 trace.def

posix.mak

@@ -47,11 +47,8 @@ MANIFEST= \
 	posix.mak \
 	win32.mak \
 	\
-	import/object.di \
-	\
-	import/core/thread.di \
-	\
 	src/object_.d \
+	src/object.di \
 	\
 	src/core/atomic.d \
 	src/core/bitop.d \
@@ -63,6 +60,7 @@ MANIFEST= \
 	src/core/runtime.d \
 	src/core/simd.d \
 	src/core/thread.d \
+	src/core/thread.di \
 	src/core/time.d \
 	src/core/vararg.d \
 	\
@@ -415,6 +413,7 @@ IMPORTS=\
 	$(IMPDIR)/core/sync/semaphore.di
 
 COPY=\
+	$(IMPDIR)/object.di \
 	$(IMPDIR)/core/atomic.d \
 	$(IMPDIR)/core/bitop.d \
 	$(IMPDIR)/core/cpuid.d \
@@ -424,6 +423,7 @@ COPY=\
 	$(IMPDIR)/core/memory.d \
 	$(IMPDIR)/core/runtime.d \
 	$(IMPDIR)/core/simd.d \
+	$(IMPDIR)/core/thread.di \
 	$(IMPDIR)/core/time.d \
 	$(IMPDIR)/core/vararg.d \
 	\
@@ -532,7 +532,7 @@ $(DOCDIR)/core_sync_%.html : src/core/sync/%.d
 
 ######################## Header .di file generation ##############################
 
-import: $(IMPORTS) 
+import: $(IMPORTS)
 
 $(IMPDIR)/core/sync/%.di : src/core/sync/%.d
 	$(DMD) -m$(MODEL) -c -o- -Isrc -Iimport -Hf$@ $<
@@ -551,7 +551,10 @@ copydir:
 
 copy: $(COPY)
 
-$(IMPDIR)/core/%.d : src/core/%.d
+$(IMPDIR)/%.di : src/%.di
+	cp $< $@
+
+$(IMPDIR)/%.d : src/%.d
 	cp $< $@
 
 ################### C/ASM Targets ############################
@@ -609,5 +612,4 @@ install: druntime.zip
 	unzip -o druntime.zip -d /dmd2/src/druntime
 
 clean:
-	rm -rf obj lib $(IMPDIR)/core/stdc $(IMPDIR)/core/sync $(IMPDIR)/core/sys doc
-	rm -rf $(IMPDIR)/core/atomic.d $(IMPDIR)/core/bitop.d $(IMPDIR)/core/cpuid.d $(IMPDIR)/core/demangle.d $(IMPDIR)/core/exception.d $(IMPDIR)/core/math.d $(IMPDIR)/core/memory.d $(IMPDIR)/core/runtime.d $(IMPDIR)/core/simd.d $(IMPDIR)/core/time.d $(IMPDIR)/core/vararg.d
+	rm -rf obj lib $(IMPDIR) $(DOCDIR)

win32.mak

@@ -26,11 +26,8 @@ MANIFEST= \
 	posix.mak \
 	win32.mak \
 	\
-	import\object.di \
-	\
-	import\core\thread.di \
-	\
 	src\object_.d \
+	src\object.di \
 	\
 	src\core\atomic.d \
 	src\core\bitop.d \
@@ -42,6 +39,7 @@ MANIFEST= \
 	src\core\runtime.d \
 	src\core\simd.d \
 	src\core\thread.d \
+	src\core\thread.di \
 	src\core\time.d \
 	src\core\vararg.d \
 	\
@@ -389,6 +387,7 @@ IMPORTS=\
 	$(IMPDIR)\core\sync\semaphore.di
 
 COPY=\
+	$(IMPDIR)\object.di \
 	$(IMPDIR)\core\atomic.d \
 	$(IMPDIR)\core\bitop.d \
 	$(IMPDIR)\core\cpuid.d \
@@ -398,6 +397,7 @@ COPY=\
 	$(IMPDIR)\core\memory.d \
 	$(IMPDIR)\core\runtime.d \
 	$(IMPDIR)\core\simd.d \
+	$(IMPDIR)\core\thread.di \
 	$(IMPDIR)\core\time.d \
 	$(IMPDIR)\core\vararg.d \
 	\
@@ -579,6 +579,9 @@ copydir: $(IMPDIR)
 
 copy: $(COPY)
 
+$(IMPDIR)\object.di : src\object.di
+	copy $** $@
+
 $(IMPDIR)\core\atomic.d : src\core\atomic.d
 	copy $** $@
 
@@ -606,6 +609,9 @@ $(IMPDIR)\core\runtime.d : src\core\runtime.d
 $(IMPDIR)\core\simd.d : src\core\simd.d
 	copy $** $@
 
+$(IMPDIR)\core\thread.di : src\core\thread.di
+	copy $** $@
+
 $(IMPDIR)\core\time.d : src\core\time.d
 	copy $** $@
 
@@ -853,8 +859,5 @@ install: druntime.zip
 	unzip -o druntime.zip -d \dmd2\src\druntime
 
 clean:
-	del $(DOCS) $(DRUNTIME) $(OBJS_TO_DELETE) $(GCSTUB)
-	del $(IMPDIR)\core\atomic.d $(IMPDIR)\core\bitop.d $(IMPDIR)\core\cpuid.d $(IMPDIR)\core\demangle.d $(IMPDIR)\core\exception.d $(IMPDIR)\core\math.d $(IMPDIR)\core\memory.d $(IMPDIR)\core\runtime.d $(IMPDIR)\core\simd.d $(IMPDIR)\core\time.d $(IMPDIR)\core\vararg.d
-	rmdir $(IMPDIR)\core\stdc /S /Q
-	rmdir $(IMPDIR)\core\sync /S /Q
-	rmdir $(IMPDIR)\core\sys /S /Q
+	del $(DRUNTIME) $(OBJS_TO_DELETE) $(GCSTUB)
+	rmdir /S /Q $(DOCDIR) $(IMPDIR)