remove object.di, rename object_.d to object.d

dlang · May 9, 2015 · c1b4f36 · c1b4f36
1 parent 2c74db0
commit c1b4f36
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 929 deletions.
diff --git a/mak/COPY b/mak/COPY
@@ -1,5 +1,5 @@
 COPY=\
-	$(IMPDIR)\object.di \
+	$(IMPDIR)\object.d \
 	$(IMPDIR)\core\atomic.d \
 	$(IMPDIR)\core\bitop.d \
 	$(IMPDIR)\core\checkedint.d \

diff --git a/mak/MANIFEST b/mak/MANIFEST
@@ -13,8 +13,7 @@ MANIFEST=\
 	mak\MANIFEST \
 	mak\SRCS \
 	\
-	src\object_.d \
-	src\object.di \
+	src\object.d \
 	src\test_runner.d \
 	\
 	src\core\atomic.d \

diff --git a/mak/SRCS b/mak/SRCS
@@ -1,5 +1,5 @@
 SRCS=\
-	src\object_.d \
+	src\object.d \
 	\
 	src\core\atomic.d \
 	src\core\bitop.d \

diff --git a/posix.mak b/posix.mak
@@ -121,7 +121,7 @@ endif
 
 doc: $(DOCS)
 
-$(DOCDIR)/object.html : src/object_.d
+$(DOCDIR)/object.html : src/object.d
 	$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
 
 $(DOCDIR)/core_%.html : src/core/%.d
@@ -145,8 +145,9 @@ $(IMPDIR)/core/sync/%.di : src/core/sync/%.d
 
 copy: $(COPY)
 
-$(IMPDIR)/object.di : src/object_.d
+$(IMPDIR)/object.d : src/object.d
 	@mkdir -p `dirname $@`
+	@rm -f $(IMPDIR)/object.di
 	cp $< $@
 
 $(IMPDIR)/%.di : src/%.di

diff --git a/src/object_.d → src/object.d b/src/object_.d → src/object.d