Remove \r\n in windows makefile.

diff --git a/src/bin/psql/win32.mak b/src/bin/psql/win32.mak
index 4a2bb95..f414594 100644 (file)
--- a/src/bin/psql/win32.mak
+++ b/src/bin/psql/win32.mak
@@ -1,64 +1,64 @@
-# Makefile for Microsoft Visual C++ 5.0 (or compat)\r
-\r
-!IF "$(OS)" == "Windows_NT"\r
-NULL=\r
-!ELSE \r
-NULL=nul\r
-!ENDIF \r
-\r
-CPP=cl.exe\r
-\r
-OUTDIR=.\Release\r
-INTDIR=.\Release\r
-# Begin Custom Macros\r
-OutDir=.\Release\r
-# End Custom Macros\r
-\r
-ALL : "$(OUTDIR)\psql.exe"\r
-\r
-CLEAN :\r
-       -@erase "$(INTDIR)\psql.obj"\r
-       -@erase "$(INTDIR)\stringutils.obj"\r
-       -@erase "$(INTDIR)\getopt.obj"\r
-       -@erase "$(INTDIR)\vc50.idb"\r
-       -@erase "$(OUTDIR)\psql.exe"\r
-\r
-"$(OUTDIR)" :\r
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
-\r
-CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D\\r
- "_MBCS" /Fp"$(INTDIR)\psql.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \\r
- /I ..\..\include /I ..\..\interfaces\libpq\r
-CPP_OBJS=.\Release/\r
-CPP_SBRS=.\r
-\r
-LINK32=link.exe\r
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\\r
- advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\\r
- odbccp32.lib wsock32.lib /nologo /subsystem:console /incremental:no\\r
- /pdb:"$(OUTDIR)\psql.pdb" /machine:I386 /out:"$(OUTDIR)\psql.exe" \r
-LINK32_OBJS= \\r
-       "$(INTDIR)\psql.obj" \\r
-       "$(INTDIR)\stringutils.obj" \\r
-       "$(INTDIR)\getopt.obj" \\r
-       "..\..\interfaces\libpq\Release\libpqdll.lib"\r
-\r
-"$(OUTDIR)\psql.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
-    $(LINK32) @<<\r
-  $(LINK32_FLAGS) $(LINK32_OBJS)\r
-<<\r
-\r
-"$(OUTDIR)\getopt.obj" : "$(OUTDIR)" ..\..\utils\getopt.c\r
-    $(CPP) @<<\r
-    $(CPP_PROJ) ..\..\utils\getopt.c\r
-<<\r
-\r
-.c{$(CPP_OBJS)}.obj::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.cpp{$(CPP_OBJS)}.obj::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
+# Makefile for Microsoft Visual C++ 5.0 (or compat)
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+CPP=cl.exe
+
+OUTDIR=.\Release
+INTDIR=.\Release
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+ALL : "$(OUTDIR)\psql.exe"
+
+CLEAN :
+       -@erase "$(INTDIR)\psql.obj"
+       -@erase "$(INTDIR)\stringutils.obj"
+       -@erase "$(INTDIR)\getopt.obj"
+       -@erase "$(INTDIR)\vc50.idb"
+       -@erase "$(OUTDIR)\psql.exe"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D\
+ "_MBCS" /Fp"$(INTDIR)\psql.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \
+ /I ..\..\include /I ..\..\interfaces\libpq
+CPP_OBJS=.\Release/
+CPP_SBRS=.
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
+ advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
+ odbccp32.lib wsock32.lib /nologo /subsystem:console /incremental:no\
+ /pdb:"$(OUTDIR)\psql.pdb" /machine:I386 /out:"$(OUTDIR)\psql.exe" 
+LINK32_OBJS= \
+       "$(INTDIR)\psql.obj" \
+       "$(INTDIR)\stringutils.obj" \
+       "$(INTDIR)\getopt.obj" \
+       "..\..\interfaces\libpq\Release\libpqdll.lib"
+
+"$(OUTDIR)\psql.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+"$(OUTDIR)\getopt.obj" : "$(OUTDIR)" ..\..\utils\getopt.c
+    $(CPP) @<<
+    $(CPP_PROJ) ..\..\utils\getopt.c
+<<
+
+.c{$(CPP_OBJS)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(CPP_OBJS)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<