Skip to content

Commit 9fbaf1d

Browse files
committed
Remove \r\n in windows makefile.
1 parent 63e39ab commit 9fbaf1d

File tree

1 file changed

+64
-64
lines changed

1 file changed

+64
-64
lines changed

src/bin/psql/win32.mak

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,64 @@
1-
# Makefile for Microsoft Visual C++ 5.0 (or compat)
2-
3-
!IF "$(OS)" == "Windows_NT"
4-
NULL=
5-
!ELSE
6-
NULL=nul
7-
!ENDIF
8-
9-
CPP=cl.exe
10-
11-
OUTDIR=.\Release
12-
INTDIR=.\Release
13-
# Begin Custom Macros
14-
OutDir=.\Release
15-
# End Custom Macros
16-
17-
ALL : "$(OUTDIR)\psql.exe"
18-
19-
CLEAN :
20-
-@erase "$(INTDIR)\psql.obj"
21-
-@erase "$(INTDIR)\stringutils.obj"
22-
-@erase "$(INTDIR)\getopt.obj"
23-
-@erase "$(INTDIR)\vc50.idb"
24-
-@erase "$(OUTDIR)\psql.exe"
25-
26-
"$(OUTDIR)" :
27-
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
28-
29-
CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D\
30-
"_MBCS" /Fp"$(INTDIR)\psql.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \
31-
/I ..\..\include /I ..\..\interfaces\libpq
32-
CPP_OBJS=.\Release/
33-
CPP_SBRS=.
34-
35-
LINK32=link.exe
36-
LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
37-
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
38-
odbccp32.lib wsock32.lib /nologo /subsystem:console /incremental:no\
39-
/pdb:"$(OUTDIR)\psql.pdb" /machine:I386 /out:"$(OUTDIR)\psql.exe"
40-
LINK32_OBJS= \
41-
"$(INTDIR)\psql.obj" \
42-
"$(INTDIR)\stringutils.obj" \
43-
"$(INTDIR)\getopt.obj" \
44-
"..\..\interfaces\libpq\Release\libpqdll.lib"
45-
46-
"$(OUTDIR)\psql.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
47-
$(LINK32) @<<
48-
$(LINK32_FLAGS) $(LINK32_OBJS)
49-
<<
50-
51-
"$(OUTDIR)\getopt.obj" : "$(OUTDIR)" ..\..\utils\getopt.c
52-
$(CPP) @<<
53-
$(CPP_PROJ) ..\..\utils\getopt.c
54-
<<
55-
56-
.c{$(CPP_OBJS)}.obj::
57-
$(CPP) @<<
58-
$(CPP_PROJ) $<
59-
<<
60-
61-
.cpp{$(CPP_OBJS)}.obj::
62-
$(CPP) @<<
63-
$(CPP_PROJ) $<
64-
<<
1+
# Makefile for Microsoft Visual C++ 5.0 (or compat)
2+
3+
!IF "$(OS)" == "Windows_NT"
4+
NULL=
5+
!ELSE
6+
NULL=nul
7+
!ENDIF
8+
9+
CPP=cl.exe
10+
11+
OUTDIR=.\Release
12+
INTDIR=.\Release
13+
# Begin Custom Macros
14+
OutDir=.\Release
15+
# End Custom Macros
16+
17+
ALL : "$(OUTDIR)\psql.exe"
18+
19+
CLEAN :
20+
-@erase "$(INTDIR)\psql.obj"
21+
-@erase "$(INTDIR)\stringutils.obj"
22+
-@erase "$(INTDIR)\getopt.obj"
23+
-@erase "$(INTDIR)\vc50.idb"
24+
-@erase "$(OUTDIR)\psql.exe"
25+
26+
"$(OUTDIR)" :
27+
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
28+
29+
CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D\
30+
"_MBCS" /Fp"$(INTDIR)\psql.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \
31+
/I ..\..\include /I ..\..\interfaces\libpq
32+
CPP_OBJS=.\Release/
33+
CPP_SBRS=.
34+
35+
LINK32=link.exe
36+
LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
37+
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
38+
odbccp32.lib wsock32.lib /nologo /subsystem:console /incremental:no\
39+
/pdb:"$(OUTDIR)\psql.pdb" /machine:I386 /out:"$(OUTDIR)\psql.exe"
40+
LINK32_OBJS= \
41+
"$(INTDIR)\psql.obj" \
42+
"$(INTDIR)\stringutils.obj" \
43+
"$(INTDIR)\getopt.obj" \
44+
"..\..\interfaces\libpq\Release\libpqdll.lib"
45+
46+
"$(OUTDIR)\psql.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
47+
$(LINK32) @<<
48+
$(LINK32_FLAGS) $(LINK32_OBJS)
49+
<<
50+
51+
"$(OUTDIR)\getopt.obj" : "$(OUTDIR)" ..\..\utils\getopt.c
52+
$(CPP) @<<
53+
$(CPP_PROJ) ..\..\utils\getopt.c
54+
<<
55+
56+
.c{$(CPP_OBJS)}.obj::
57+
$(CPP) @<<
58+
$(CPP_PROJ) $<
59+
<<
60+
61+
.cpp{$(CPP_OBJS)}.obj::
62+
$(CPP) @<<
63+
$(CPP_PROJ) $<
64+
<<

0 commit comments

Comments
 (0)