Fixed a few build script issues on posix, including a bug in looking for some of...

[software/druntime.git] / src / dmd-win32.mak

diff --git a/src/dmd-win32.mak b/src/dmd-win32.mak
index 3a637b8ae3d08ed39dccd48b4b61e9072b049a61..d7c83b1d0ff5ed60d35afcc4f32250b2fdf208cf 100644 (file)
--- a/src/dmd-win32.mak
+++ b/src/dmd-win32.mak
@@ -1,101 +1,104 @@
-# Makefile to build the composite D runtime library for Win32\r
-# Designed to work with DigitalMars make\r
-# Targets:\r
-#      make\r
-#              Same as make all\r
-#      make lib\r
-#              Build the runtime library\r
-#   make doc\r
-#       Generate documentation\r
-#      make clean\r
-#              Delete unneeded files created by build process\r
-\r
-LIB_TARGET=druntime-dmd.lib\r
-LIB_MASK=druntime-dmd*.lib\r
-\r
-DIR_CC=core\r
-DIR_RT=compiler\dmd\r
-DIR_GC=gc\basic\r
-\r
-LIB_CC=$(DIR_CC)\druntime-core.lib\r
-LIB_RT=$(DIR_RT)\druntime-rt-dmd.lib\r
-LIB_GC=$(DIR_GC)\druntime-gc-basic.lib\r
-\r
-CP=xcopy /y\r
-RM=del /f\r
-MD=mkdir\r
-\r
-CC=dmc\r
-LC=lib\r
-DC=dmd\r
-\r
-LIB_DEST=..\lib\r
-\r
-ADD_CFLAGS=\r
-ADD_DFLAGS=\r
-\r
-targets : lib doc\r
-all     : lib doc\r
-\r
-######################################################\r
-\r
-ALL_OBJS=\r
-\r
-######################################################\r
-\r
-ALL_DOCS=\r
-\r
-######################################################\r
-\r
-lib : $(ALL_OBJS)\r
-       cd $(DIR_CC)\r
-       make -fwin32.mak lib DC=$(DC) ADD_DFLAGS="$(ADD_DFLAGS)" ADD_CFLAGS="$(ADD_CFLAGS)"\r
-       cd ..\r
-       cd $(DIR_RT)\r
-       make -fwin32.mak lib\r
-       cd ..\..\r
-       cd $(DIR_GC)\r
-       make -fwin32.mak lib DC=$(DC) ADD_DFLAGS="$(ADD_DFLAGS)" ADD_CFLAGS="$(ADD_CFLAGS)"\r
-       cd ..\..\r
-       $(RM) $(LIB_TARGET)\r
-       $(LC) -c -n $(LIB_TARGET) $(LIB_CC) $(LIB_RT) $(LIB_GC)\r
-\r
-doc : $(ALL_DOCS)\r
-       cd $(DIR_CC)\r
-       make -fwin32.mak doc\r
-       cd ..\r
-       cd $(DIR_RT)\r
-       make -fwin32.mak doc\r
-       cd ..\..\r
-       cd $(DIR_GC)\r
-       make -fwin32.mak doc\r
-       cd ..\..\r
-\r
-######################################################\r
-\r
-clean :\r
-       $(RM) /s *.di\r
-       $(RM) $(ALL_OBJS)\r
-       $(RM) $(ALL_DOCS)\r
-       cd $(DIR_CC)\r
-       make -fwin32.mak clean\r
-       cd ..\r
-       cd $(DIR_RT)\r
-       make -fwin32.mak clean\r
-       cd ..\..\r
-       cd $(DIR_GC)\r
-       make -fwin32.mak clean\r
-       cd ..\..\r
-       $(RM) $(LIB_MASK)\r
-\r
-install :\r
-       cd $(DIR_CC)\r
-       make -fwin32.mak install\r
-       cd ..\r
-       cd $(DIR_RT)\r
-       make -fwin32.mak install\r
-       cd ..\..\r
-       cd $(DIR_GC)\r
-       make -fwin32.mak install\r
-       cd ..\..\r
-       $(CP) $(LIB_MASK) $(LIB_DEST)\.\r
+# Makefile to build the composite D runtime library for Win32
+# Designed to work with DigitalMars make
+# Targets:
+#   make
+#       Same as make all
+#   make lib
+#       Build the runtime library
+#   make doc
+#       Generate documentation
+#   make clean
+#       Delete unneeded files created by build process
+
+LIB_TARGET=druntime-dmd.lib
+DUP_TARGET=druntime.lib
+LIB_MASK=druntime*.lib
+
+DIR_CC=common
+DIR_RT=compiler\dmd
+DIR_GC=gc\basic
+
+LIB_CC=$(DIR_CC)\druntime-core.lib
+LIB_RT=$(DIR_RT)\druntime-rt-dmd.lib
+LIB_GC=$(DIR_GC)\druntime-gc-basic.lib
+
+CP=xcopy /y
+RM=del /f
+MD=mkdir
+
+CC=dmc
+LC=lib
+DC=dmd
+
+LIB_DEST=..\lib
+
+ADD_CFLAGS=
+ADD_DFLAGS=
+
+targets : lib doc
+all     : lib doc
+
+######################################################
+
+ALL_OBJS=
+
+######################################################
+
+ALL_DOCS=
+
+######################################################
+
+lib : $(ALL_OBJS)
+       cd $(DIR_CC)
+       make -fwin32.mak lib DC=$(DC) ADD_DFLAGS="$(ADD_DFLAGS)" ADD_CFLAGS="$(ADD_CFLAGS)"
+       cd ..
+       cd $(DIR_RT)
+       make -fwin32.mak lib DC=$(DC)
+       cd ..\..
+       cd $(DIR_GC)
+       make -fwin32.mak lib DC=$(DC) ADD_DFLAGS="$(ADD_DFLAGS)" ADD_CFLAGS="$(ADD_CFLAGS)"
+       cd ..\..
+       $(RM) $(LIB_TARGET)
+       $(LC) -c -n $(LIB_TARGET) $(LIB_CC) $(LIB_RT) $(LIB_GC)
+       $(RM) $(DUP_TARGET)
+       copy $(LIB_TARGET) $(DUP_TARGET)
+
+doc : $(ALL_DOCS)
+       cd $(DIR_CC)
+       make -fwin32.mak doc DC=$(DC)
+       cd ..
+       cd $(DIR_RT)
+       make -fwin32.mak doc DC=$(DC)
+       cd ..\..
+       cd $(DIR_GC)
+       make -fwin32.mak doc DC=$(DC)
+       cd ..\..
+
+######################################################
+
+clean :
+       $(RM) /s *.di
+       $(RM) $(ALL_OBJS)
+       $(RM) $(ALL_DOCS)
+       cd $(DIR_CC)
+       make -fwin32.mak clean
+       cd ..
+       cd $(DIR_RT)
+       make -fwin32.mak clean
+       cd ..\..
+       cd $(DIR_GC)
+       make -fwin32.mak clean
+       cd ..\..
+       $(RM) $(LIB_MASK)
+
+install :
+       cd $(DIR_CC)
+       make -fwin32.mak install
+       cd ..
+       cd $(DIR_RT)
+       make -fwin32.mak install
+       cd ..\..
+       cd $(DIR_GC)
+       make -fwin32.mak install
+       cd ..\..
+       $(CP) $(LIB_MASK) $(LIB_DEST)\.