Use unix EOL style for makefiles

diff --git a/src/common/posix.mak b/src/common/posix.mak
index 5f8ba4dc6f1a6721a6d2f09725a0890d40f6b2c1..180dd76bff52fa725e51f3e92c7cf2a35045c7b7 100644 (file)
--- a/src/common/posix.mak
+++ b/src/common/posix.mak
@@ -1,163 +1,163 @@
-# Makefile to build the D runtime library core components for Posix\r
-# Designed to work with GNU make\r
-# Targets:\r
-#      make\r
-#              Same as make all\r
-#      make lib\r
-#              Build the common library\r
-#   make doc\r
-#       Generate documentation\r
-#      make clean\r
-#              Delete unneeded files created by build process\r
-\r
-LIB_BASE=libdruntime-core\r
-LIB_BUILD=\r
-LIB_TARGET=$(LIB_BASE)$(LIB_BUILD).a\r
-LIB_MASK=$(LIB_BASE)*.a\r
-\r
-CP=cp -f\r
-RM=rm -f\r
-MD=mkdir -p\r
-\r
-ADD_CFLAGS=\r
-ADD_DFLAGS=\r
-\r
-CFLAGS_RELEASE=-O $(ADD_CFLAGS)\r
-CFLAGS_DEBUG=-g $(ADD_CFLAGS)\r
-CFLAGS=$(CFLAGS_RELEASE)\r
-\r
-DFLAGS_RELEASE=-release -O -inline -w -nofloat $(ADD_DFLAGS)\r
-DFLAGS_DEBUG=-g -w -nofloat $(ADD_DFLAGS)\r
-DFLAGS=$(DFLAGS_RELEASE)\r
-\r
-TFLAGS_RELEASE=-O -inline -w  -nofloat $(ADD_DFLAGS)\r
-TFLAGS_DEBUG=-g -w -nofloat $(ADD_DFLAGS)\r
-TFLAGS=$(TFLAGS_RELEASE)\r
-\r
-DOCFLAGS=-version=DDoc\r
-\r
-CC=gcc\r
-LC=$(AR) -qsv\r
-DC=dmd\r
-\r
-INC_DEST=../../import\r
-LIB_DEST=../../lib\r
-DOC_DEST=../../doc\r
-\r
-.SUFFIXES: .s .S .c .cpp .d .html .o\r
-\r
-.s.o:\r
-       $(CC) -c $(CFLAGS) $< -o$@\r
-\r
-.S.o:\r
-       $(CC) -c $(CFLAGS) $< -o$@\r
-\r
-.c.o:\r
-       $(CC) -c $(CFLAGS) $< -o$@\r
-\r
-.cpp.o:\r
-       g++ -c $(CFLAGS) $< -o$@\r
-\r
-.d.o:\r
-       $(DC) -c $(DFLAGS) -Hf$*.di $< -of$@\r
-#      $(DC) -c $(DFLAGS) $< -of$@\r
-\r
-.d.html:\r
-       $(DC) -c -o- $(DOCFLAGS) -Df$*.html $<\r
-\r
-targets : lib doc\r
-all     : lib doc\r
-core    : lib\r
-lib     : core.lib\r
-doc     : core.doc\r
-\r
-######################################################\r
-\r
-OBJ_CORE= \\r
-    core/bitmanip.o \\r
-    core/exception.o \\r
-    core/memory_.o \\r
-    core/runtime.o \\r
-    core/thread.o \\r
-    core/vararg.o\r
-\r
-OBJ_STDC= \\r
-    core/stdc/errno.o\r
-\r
-ALL_OBJS= \\r
-    $(OBJ_CORE) \\r
-    $(OBJ_STDC)\r
-\r
-######################################################\r
-\r
-DOC_CORE= \\r
-    core/bitmanip.html \\r
-    core/exception.html \\r
-    core/memory.html \\r
-    core/runtime.html \\r
-    core/thread.html \\r
-    core/vararg.html\r
-\r
-######################################################\r
-\r
-ALL_DOCS=\r
-\r
-######################################################\r
-\r
-unittest :\r
-       make -fposix.mak DC="$(DC)" LIB_BUILD="" DFLAGS="$(DFLAGS_RELEASE) -unittest"\r
-\r
-release :\r
-       make -fposix.mak DC="$(DC)" LIB_BUILD="" DFLAGS="$(DFLAGS_RELEASE)"\r
-\r
-debug :\r
-       make -fposix.mak DC="$(DC)" LIB_BUILD="-d" DFLAGS="$(DFLAGS_DEBUG)"\r
-\r
-######################################################\r
-\r
-core.lib : $(LIB_TARGET)\r
-\r
-$(LIB_TARGET) : $(ALL_OBJS)\r
-       $(RM) $@\r
-       $(LC) $@ $(ALL_OBJS)\r
-\r
-core.doc : $(ALL_DOCS)\r
-       echo Documentation generated.\r
-\r
-######################################################\r
-\r
-### bitmanip\r
-\r
-core/bitmanip.o : core/bitmanip.d\r
-       $(DC) -c $(DFLAGS) core/bitmanip.d -of$@\r
-\r
-### memory\r
-\r
-core/memory_.o : core/memory.d\r
-       $(DC) -c $(DFLAGS) -Hf$*.di $< -of$@\r
-\r
-### thread\r
-\r
-core/thread.o : core/thread.d\r
-       $(DC) -c $(DFLAGS) -d -Hf$*.di core/thread.d -of$@\r
-\r
-### vararg\r
-\r
-core/vararg.o : core/vararg.d\r
-       $(DC) -c $(TFLAGS) -Hf$*.di core/vararg.d -of$@\r
-\r
-######################################################\r
-\r
-clean :\r
-       find . -name "*.di" | xargs $(RM)\r
-       $(RM) $(ALL_OBJS)\r
-       $(RM) $(ALL_DOCS)\r
-       find . -name "$(LIB_MASK)" | xargs $(RM)\r
-\r
-install :\r
-       $(MD) $(INC_DEST)\r
-       find . -name "*.di" -exec cp -f {} $(INC_DEST)/{} \;\r
-       $(MD) $(DOC_DEST)\r
-       find . -name "*.html" -exec cp -f {} $(DOC_DEST)/{} \;\r
-       $(MD) $(LIB_DEST)\r
-       find . -name "$(LIB_MASK)" -exec cp -f {} $(LIB_DEST)/{} \;\r
+# Makefile to build the D runtime library core components for Posix
+# Designed to work with GNU make
+# Targets:
+#      make
+#              Same as make all
+#      make lib
+#              Build the common library
+#   make doc
+#       Generate documentation
+#      make clean
+#              Delete unneeded files created by build process
+
+LIB_BASE=libdruntime-core
+LIB_BUILD=
+LIB_TARGET=$(LIB_BASE)$(LIB_BUILD).a
+LIB_MASK=$(LIB_BASE)*.a
+
+CP=cp -f
+RM=rm -f
+MD=mkdir -p
+
+ADD_CFLAGS=
+ADD_DFLAGS=
+
+CFLAGS_RELEASE=-O $(ADD_CFLAGS)
+CFLAGS_DEBUG=-g $(ADD_CFLAGS)
+CFLAGS=$(CFLAGS_RELEASE)
+
+DFLAGS_RELEASE=-release -O -inline -w -nofloat $(ADD_DFLAGS)
+DFLAGS_DEBUG=-g -w -nofloat $(ADD_DFLAGS)
+DFLAGS=$(DFLAGS_RELEASE)
+
+TFLAGS_RELEASE=-O -inline -w  -nofloat $(ADD_DFLAGS)
+TFLAGS_DEBUG=-g -w -nofloat $(ADD_DFLAGS)
+TFLAGS=$(TFLAGS_RELEASE)
+
+DOCFLAGS=-version=DDoc
+
+CC=gcc
+LC=$(AR) -qsv
+DC=dmd
+
+INC_DEST=../../import
+LIB_DEST=../../lib
+DOC_DEST=../../doc
+
+.SUFFIXES: .s .S .c .cpp .d .html .o
+
+.s.o:
+       $(CC) -c $(CFLAGS) $< -o$@
+
+.S.o:
+       $(CC) -c $(CFLAGS) $< -o$@
+
+.c.o:
+       $(CC) -c $(CFLAGS) $< -o$@
+
+.cpp.o:
+       g++ -c $(CFLAGS) $< -o$@
+
+.d.o:
+       $(DC) -c $(DFLAGS) -Hf$*.di $< -of$@
+#      $(DC) -c $(DFLAGS) $< -of$@
+
+.d.html:
+       $(DC) -c -o- $(DOCFLAGS) -Df$*.html $<
+
+targets : lib doc
+all     : lib doc
+core    : lib
+lib     : core.lib
+doc     : core.doc
+
+######################################################
+
+OBJ_CORE= \
+    core/bitmanip.o \
+    core/exception.o \
+    core/memory_.o \
+    core/runtime.o \
+    core/thread.o \
+    core/vararg.o
+
+OBJ_STDC= \
+    core/stdc/errno.o
+
+ALL_OBJS= \
+    $(OBJ_CORE) \
+    $(OBJ_STDC)
+
+######################################################
+
+DOC_CORE= \
+    core/bitmanip.html \
+    core/exception.html \
+    core/memory.html \
+    core/runtime.html \
+    core/thread.html \
+    core/vararg.html
+
+######################################################
+
+ALL_DOCS=
+
+######################################################
+
+unittest :
+       make -fposix.mak DC="$(DC)" LIB_BUILD="" DFLAGS="$(DFLAGS_RELEASE) -unittest"
+
+release :
+       make -fposix.mak DC="$(DC)" LIB_BUILD="" DFLAGS="$(DFLAGS_RELEASE)"
+
+debug :
+       make -fposix.mak DC="$(DC)" LIB_BUILD="-d" DFLAGS="$(DFLAGS_DEBUG)"
+
+######################################################
+
+core.lib : $(LIB_TARGET)
+
+$(LIB_TARGET) : $(ALL_OBJS)
+       $(RM) $@
+       $(LC) $@ $(ALL_OBJS)
+
+core.doc : $(ALL_DOCS)
+       echo Documentation generated.
+
+######################################################
+
+### bitmanip
+
+core/bitmanip.o : core/bitmanip.d
+       $(DC) -c $(DFLAGS) core/bitmanip.d -of$@
+
+### memory
+
+core/memory_.o : core/memory.d
+       $(DC) -c $(DFLAGS) -Hf$*.di $< -of$@
+
+### thread
+
+core/thread.o : core/thread.d
+       $(DC) -c $(DFLAGS) -d -Hf$*.di core/thread.d -of$@
+
+### vararg
+
+core/vararg.o : core/vararg.d
+       $(DC) -c $(TFLAGS) -Hf$*.di core/vararg.d -of$@
+
+######################################################
+
+clean :
+       find . -name "*.di" | xargs $(RM)
+       $(RM) $(ALL_OBJS)
+       $(RM) $(ALL_DOCS)
+       find . -name "$(LIB_MASK)" | xargs $(RM)
+
+install :
+       $(MD) $(INC_DEST)
+       find . -name "*.di" -exec cp -f {} $(INC_DEST)/{} \;
+       $(MD) $(DOC_DEST)
+       find . -name "*.html" -exec cp -f {} $(DOC_DEST)/{} \;
+       $(MD) $(LIB_DEST)
+       find . -name "$(LIB_MASK)" -exec cp -f {} $(LIB_DEST)/{} \;

diff --git a/src/common/win32.mak b/src/common/win32.mak
index 70f7ad20648aa83d8abb73333780c6bd2bfa8536..df7b91237a471f25315fe70679fe80fd0b6d2d5a 100644 (file)
--- a/src/common/win32.mak
+++ b/src/common/win32.mak
@@ -1,155 +1,155 @@
-# Makefile to build the D runtime library core components for Win32\r
-# Designed to work with DigitalMars make\r
-# Targets:\r
-#      make\r
-#              Same as make all\r
-#      make lib\r
-#              Build the common library\r
-#   make doc\r
-#       Generate documentation\r
-#      make clean\r
-#              Delete unneeded files created by build process\r
-\r
-LIB_BASE=druntime-core\r
-LIB_BUILD=\r
-LIB_TARGET=$(LIB_BASE)$(LIB_BUILD).lib\r
-LIB_MASK=$(LIB_BASE)*.lib\r
-\r
-CP=xcopy /y\r
-RM=del /f\r
-MD=mkdir\r
-\r
-ADD_CFLAGS=\r
-ADD_DFLAGS=\r
-\r
-CFLAGS_RELEASE=-mn -6 -r $(ADD_CFLAGS)\r
-CFLAGS_DEBUG=-g -mn -6 -r $(ADD_CFLAGS)\r
-CFLAGS=$(CFLAGS_RELEASE)\r
-\r
-DFLAGS_RELEASE=-release -O -inline -w -nofloat $(ADD_DFLAGS)\r
-DFLAGS_DEBUG=-g -w -nofloat $(ADD_DFLAGS)\r
-DFLAGS=$(DFLAGS_RELEASE)\r
-\r
-TFLAGS_RELEASE=-O -inline -w  -nofloat $(ADD_DFLAGS)\r
-TFLAGS_DEBUG=-g -w -nofloat $(ADD_DFLAGS)\r
-TFLAGS=$(TFLAGS_RELEASE)\r
-\r
-DOCFLAGS=-version=DDoc\r
-\r
-CC=dmc\r
-LC=lib\r
-DC=dmd\r
-\r
-INC_DEST=..\..\import\r
-LIB_DEST=..\..\lib\r
-DOC_DEST=..\..\doc\r
-\r
-.DEFAULT: .asm .c .cpp .d .html .obj\r
-\r
-.asm.obj:\r
-       $(CC) -c $<\r
-\r
-.c.obj:\r
-       $(CC) -c $(CFLAGS) $< -o$@\r
-\r
-.cpp.obj:\r
-       $(CC) -c $(CFLAGS) $< -o$@\r
-\r
-.d.obj:\r
-       $(DC) -c $(DFLAGS) -Hf$*.di $< -of$@\r
-#      $(DC) -c $(DFLAGS) $< -of$@\r
-\r
-.d.html:\r
-       $(DC) -c -o- $(DOCFLAGS) -Df$*.html $<\r
-\r
-targets : lib doc\r
-all     : lib doc\r
-core    : lib\r
-lib     : core.lib\r
-doc     : core.doc\r
-\r
-######################################################\r
-\r
-OBJ_CORE= \\r
-    core\bitmanip.obj \\r
-    core\exception.obj \\r
-    core\memory.obj \\r
-    core\runtime.obj \\r
-    core\thread.obj \\r
-    core\vararg.obj\r
-\r
-OBJ_STDC= \\r
-    core\stdc\errno.obj\r
-\r
-ALL_OBJS= \\r
-    $(OBJ_CORE) \\r
-    $(OBJ_STDC)\r
-\r
-######################################################\r
-\r
-DOC_CORE= \\r
-    core\bitmanip.html \\r
-    core\exception.html \\r
-    core\memory.html \\r
-    core\runtime.html \\r
-    core\thread.html \\r
-    core\vararg.html\r
-\r
-######################################################\r
-\r
-ALL_DOCS=\r
-\r
-######################################################\r
-\r
-unittest :\r
-       make -fwin32.mak DC="$(DC)" LIB_BUILD="" DFLAGS="$(DFLAGS_RELEASE) -unittest"\r
-\r
-release :\r
-       make -fwin32.mak DC="$(DC)" LIB_BUILD="" DFLAGS="$(DFLAGS_RELEASE)"\r
-\r
-debug :\r
-       make -fwin32.mak DC="$(DC)" LIB_BUILD="-d" DFLAGS="$(DFLAGS_DEBUG)"\r
-\r
-######################################################\r
-\r
-core.lib : $(LIB_TARGET)\r
-\r
-$(LIB_TARGET) : $(ALL_OBJS)\r
-       $(RM) $@\r
-       $(LC) -c -n $@ $(ALL_OBJS)\r
-\r
-core.doc : $(ALL_DOCS)\r
-       @echo Documentation generated.\r
-\r
-######################################################\r
-\r
-### bitmanip\r
-\r
-core\bitmanip.obj : core\bitmanip.d\r
-       $(DC) -c $(DFLAGS) core\bitmanip.d -of$@\r
-\r
-### thread\r
-\r
-core\thread.obj : core\thread.d\r
-       $(DC) -c $(DFLAGS) -d -Hf$*.di core\thread.d -of$@\r
-\r
-### vararg\r
-\r
-core\vararg.obj : core\vararg.d\r
-       $(DC) -c $(TFLAGS) -Hf$*.di core\vararg.d -of$@\r
-\r
-######################################################\r
-\r
-clean :\r
-       $(RM) /s .\*.di\r
-       $(RM) $(ALL_OBJS)\r
-       $(RM) $(ALL_DOCS)\r
-       $(RM) $(LIB_MASK)\r
-\r
-install :\r
-       $(MD) $(INC_DEST)\.\r
-       $(CP) /s *.di $(INC_DEST)\.\r
-       $(MD) $(DOC_DEST)\r
-       $(CP) /s *.html $(DOC_DEST)\.\r
-       $(MD) $(LIB_DEST)\r
-       $(CP) $(LIB_MASK) $(LIB_DEST)\.\r
+# Makefile to build the D runtime library core components for Win32
+# Designed to work with DigitalMars make
+# Targets:
+#      make
+#              Same as make all
+#      make lib
+#              Build the common library
+#   make doc
+#       Generate documentation
+#      make clean
+#              Delete unneeded files created by build process
+
+LIB_BASE=druntime-core
+LIB_BUILD=
+LIB_TARGET=$(LIB_BASE)$(LIB_BUILD).lib
+LIB_MASK=$(LIB_BASE)*.lib
+
+CP=xcopy /y
+RM=del /f
+MD=mkdir
+
+ADD_CFLAGS=
+ADD_DFLAGS=
+
+CFLAGS_RELEASE=-mn -6 -r $(ADD_CFLAGS)
+CFLAGS_DEBUG=-g -mn -6 -r $(ADD_CFLAGS)
+CFLAGS=$(CFLAGS_RELEASE)
+
+DFLAGS_RELEASE=-release -O -inline -w -nofloat $(ADD_DFLAGS)
+DFLAGS_DEBUG=-g -w -nofloat $(ADD_DFLAGS)
+DFLAGS=$(DFLAGS_RELEASE)
+
+TFLAGS_RELEASE=-O -inline -w  -nofloat $(ADD_DFLAGS)
+TFLAGS_DEBUG=-g -w -nofloat $(ADD_DFLAGS)
+TFLAGS=$(TFLAGS_RELEASE)
+
+DOCFLAGS=-version=DDoc
+
+CC=dmc
+LC=lib
+DC=dmd
+
+INC_DEST=..\..\import
+LIB_DEST=..\..\lib
+DOC_DEST=..\..\doc
+
+.DEFAULT: .asm .c .cpp .d .html .obj
+
+.asm.obj:
+       $(CC) -c $<
+
+.c.obj:
+       $(CC) -c $(CFLAGS) $< -o$@
+
+.cpp.obj:
+       $(CC) -c $(CFLAGS) $< -o$@
+
+.d.obj:
+       $(DC) -c $(DFLAGS) -Hf$*.di $< -of$@
+#      $(DC) -c $(DFLAGS) $< -of$@
+
+.d.html:
+       $(DC) -c -o- $(DOCFLAGS) -Df$*.html $<
+
+targets : lib doc
+all     : lib doc
+core    : lib
+lib     : core.lib
+doc     : core.doc
+
+######################################################
+
+OBJ_CORE= \
+    core\bitmanip.obj \
+    core\exception.obj \
+    core\memory.obj \
+    core\runtime.obj \
+    core\thread.obj \
+    core\vararg.obj
+
+OBJ_STDC= \
+    core\stdc\errno.obj
+
+ALL_OBJS= \
+    $(OBJ_CORE) \
+    $(OBJ_STDC)
+
+######################################################
+
+DOC_CORE= \
+    core\bitmanip.html \
+    core\exception.html \
+    core\memory.html \
+    core\runtime.html \
+    core\thread.html \
+    core\vararg.html
+
+######################################################
+
+ALL_DOCS=
+
+######################################################
+
+unittest :
+       make -fwin32.mak DC="$(DC)" LIB_BUILD="" DFLAGS="$(DFLAGS_RELEASE) -unittest"
+
+release :
+       make -fwin32.mak DC="$(DC)" LIB_BUILD="" DFLAGS="$(DFLAGS_RELEASE)"
+
+debug :
+       make -fwin32.mak DC="$(DC)" LIB_BUILD="-d" DFLAGS="$(DFLAGS_DEBUG)"
+
+######################################################
+
+core.lib : $(LIB_TARGET)
+
+$(LIB_TARGET) : $(ALL_OBJS)
+       $(RM) $@
+       $(LC) -c -n $@ $(ALL_OBJS)
+
+core.doc : $(ALL_DOCS)
+       @echo Documentation generated.
+
+######################################################
+
+### bitmanip
+
+core\bitmanip.obj : core\bitmanip.d
+       $(DC) -c $(DFLAGS) core\bitmanip.d -of$@
+
+### thread
+
+core\thread.obj : core\thread.d
+       $(DC) -c $(DFLAGS) -d -Hf$*.di core\thread.d -of$@
+
+### vararg
+
+core\vararg.obj : core\vararg.d
+       $(DC) -c $(TFLAGS) -Hf$*.di core\vararg.d -of$@
+
+######################################################
+
+clean :
+       $(RM) /s .\*.di
+       $(RM) $(ALL_OBJS)
+       $(RM) $(ALL_DOCS)
+       $(RM) $(LIB_MASK)
+
+install :
+       $(MD) $(INC_DEST)\.
+       $(CP) /s *.di $(INC_DEST)\.
+       $(MD) $(DOC_DEST)
+       $(CP) /s *.html $(DOC_DEST)\.
+       $(MD) $(LIB_DEST)
+       $(CP) $(LIB_MASK) $(LIB_DEST)\.