Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite017051

Browse files
committed
More MS VC and BCC psql compile cleanups.
1 parent8efe926 commite017051

File tree

2 files changed

+52
-45
lines changed

2 files changed

+52
-45
lines changed

‎src/bin/psql/bcc32.mak

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -59,23 +59,25 @@ ALL : sql_help.h psqlscan.c "..\..\port\pg_config_paths.h" "$(OUTDIR)\psql.exe"
5959
CLEAN :
6060
-@erase"$(INTDIR)\command.obj"
6161
-@erase"$(INTDIR)\common.obj"
62+
-@erase"$(INTDIR)\copy.obj"
63+
-@erase"$(INTDIR)\describe.obj"
6264
-@erase"$(INTDIR)\help.obj"
6365
-@erase"$(INTDIR)\input.obj"
64-
-@erase"$(INTDIR)\stringutils.obj"
65-
-@erase"$(INTDIR)\mainloop.obj"
66-
-@erase"$(INTDIR)\copy.obj"
67-
-@erase"$(INTDIR)\startup.obj"
68-
-@erase"$(INTDIR)\prompt.obj"
69-
-@erase"$(INTDIR)\variables.obj"
7066
-@erase"$(INTDIR)\large_obj.obj"
67+
-@erase"$(INTDIR)\mainloop.obj"
68+
-@erase"$(INTDIR)\mbprint.obj"
7169
-@erase"$(INTDIR)\print.obj"
72-
-@erase"$(INTDIR)\describe.obj"
70+
-@erase"$(INTDIR)\prompt.obj"
71+
-@erase"$(INTDIR)\startup.obj"
72+
-@erase"$(INTDIR)\stringutils.obj"
7373
-@erase"$(INTDIR)\tab-complete.obj"
74-
-@erase"$(INTDIR)\sprompt.obj"
74+
-@erase"$(INTDIR)\variables.obj"
75+
-@erase"$(INTDIR)\exec.obj"
7576
-@erase"$(INTDIR)\getopt.obj"
7677
-@erase"$(INTDIR)\getopt_long.obj"
7778
-@erase"$(INTDIR)\path.obj"
78-
-@erase"$(INTDIR)\mbprint.obj"
79+
-@erase"$(INTDIR)\pgstrcasecmp.obj"
80+
-@erase"$(INTDIR)\sprompt.obj"
7981
-@erase"$(INTDIR)\psql.ilc"
8082
-@erase"$(INTDIR)\psql.ild"
8183
-@erase"$(INTDIR)\psql.tds"
@@ -125,23 +127,25 @@ LINK32_FLAGS=-L$(BCB)\lib;.\$(LIBPG_DIR) -x -v
125127
LINK32_OBJS=\
126128
command.obj\
127129
common.obj\
130+
copy.obj\
131+
describe.obj\
128132
help.obj\
129133
input.obj\
130-
stringutils.obj\
131-
mainloop.obj\
132-
copy.obj\
133-
startup.obj\
134-
prompt.obj\
135-
variables.obj\
136134
large_obj.obj\
135+
mainloop.obj\
136+
mbprint.obj
137137
print.obj \
138-
describe.obj\
138+
prompt.obj \
139+
startup.obj \
140+
stringutils.obj \
139141
tab-complete.obj \
140-
sprompt.obj\
142+
variables.obj \
143+
exec.obj \
141144
getopt.obj \
142145
getopt_long.obj \
143146
path.obj \
144-
mbprint.obj
147+
pgstrcasecmp.obj \
148+
sprompt.obj \
145149

146150

147151
"$(OUTDIR)\psql.exe" : "$(OUTDIR)"$(LINK32_OBJS)
@@ -152,10 +156,12 @@ LINK32_OBJS= \
152156
import32.lib$(LIBRARIES),,
153157
!
154158

155-
sprompt.obj : "$(OUTDIR)" ..\..\port\sprompt.c
159+
exec.obj : "$(OUTDIR)" ..\..\port\exec.c
156160
getopt.obj : "$(OUTDIR)" ..\..\port\getopt.c
157161
getopt_long.obj : "$(OUTDIR)" ..\..\port\getopt_long.c
158162
path.obj : "$(OUTDIR)" ..\..\port\path.c
163+
pgstrcasecmp.obj : "$(OUTDIR)" ..\..\port\pgstrcasecmp.c
164+
sprompt.obj : "$(OUTDIR)" ..\..\port\sprompt.c
159165

160166
"sql_help.h": create_help.pl
161167
$(PERL) create_help.pl $(REFDOCDIR) $@

‎src/bin/psql/win32.mak

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,26 @@ ALL : sql_help.h psqlscan.c "..\..\port\pg_config_paths.h" "$(OUTDIR)\psql.exe"
2222
CLEAN :
2323
-@erase"$(INTDIR)\command.obj"
2424
-@erase"$(INTDIR)\common.obj"
25+
-@erase"$(INTDIR)\copy.obj"
26+
-@erase"$(INTDIR)\describe.obj"
2527
-@erase"$(INTDIR)\help.obj"
2628
-@erase"$(INTDIR)\input.obj"
27-
-@erase"$(INTDIR)\stringutils.obj"
28-
-@erase"$(INTDIR)\mainloop.obj"
29-
-@erase"$(INTDIR)\copy.obj"
30-
-@erase"$(INTDIR)\startup.obj"
31-
-@erase"$(INTDIR)\prompt.obj"
32-
-@erase"$(INTDIR)\variables.obj"
3329
-@erase"$(INTDIR)\large_obj.obj"
30+
-@erase"$(INTDIR)\mainloop.obj"
31+
-@erase"$(INTDIR)\mbprint.obj"
3432
-@erase"$(INTDIR)\print.obj"
35-
-@erase"$(INTDIR)\describe.obj"
33+
-@erase"$(INTDIR)\prompt.obj"
3634
-@erase"$(INTDIR)\psqlscan.obj"
35+
-@erase"$(INTDIR)\startup.obj"
36+
-@erase"$(INTDIR)\stringutils.obj"
3737
-@erase"$(INTDIR)\tab-complete.obj"
38-
-@erase"$(INTDIR)\sprompt.obj"
38+
-@erase"$(INTDIR)\variables.obj"
39+
-@erase"$(INTDIR)\exec.obj"
3940
-@erase"$(INTDIR)\getopt.obj"
4041
-@erase"$(INTDIR)\getopt_long.obj"
4142
-@erase"$(INTDIR)\path.obj"
42-
-@erase"$(INTDIR)\mbprint.obj"
43+
-@erase"$(INTDIR)\pgstrcasecmp.obj"
44+
-@erase"$(INTDIR)\sprompt.obj"
4345
-@erase"$(INTDIR)\*psql.pch"
4446
-@erase"$(OUTDIR)\psql.exe"
4547
-@erase"$(INTDIR)\..\..\port\pg_config_paths.h"
@@ -60,8 +62,7 @@ CLEAN :
6062

6163
CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D\
6264
"_MBCS" /Fp"$(INTDIR)\psql.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c\
63-
/I ..\..\include /I ..\..\interfaces\libpq /I ..\..\include\port\win32\
64-
/D "HAVE_STRDUP" /D "FRONTEND"
65+
/I ..\..\include /I ..\..\interfaces\libpq /D "HAVE_STRDUP" /D "FRONTEND"
6566

6667
CPP_OBJS=.\Release/
6768
CPP_SBRS=.
@@ -72,38 +73,38 @@ LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
7273
odbccp32.lib wsock32.lib /nologo /subsystem:console /incremental:no\
7374
/pdb:"$(OUTDIR)\psql.pdb" /machine:I386 /out:"$(OUTDIR)\psql.exe"
7475
LINK32_OBJS=\
75-
"$(INTDIR)\pgstrcasecmp.obj"\
76-
"$(INTDIR)\exec.obj"\
7776
"$(INTDIR)\command.obj"\
7877
"$(INTDIR)\common.obj"\
78+
"$(INTDIR)\copy.obj"\
79+
"$(INTDIR)\describe.obj"\
7980
"$(INTDIR)\help.obj"\
8081
"$(INTDIR)\input.obj"\
81-
"$(INTDIR)\stringutils.obj"\
82-
"$(INTDIR)\mainloop.obj"\
83-
"$(INTDIR)\copy.obj"\
84-
"$(INTDIR)\startup.obj"\
85-
"$(INTDIR)\prompt.obj"\
86-
"$(INTDIR)\variables.obj"\
8782
"$(INTDIR)\large_obj.obj"\
83+
"$(INTDIR)\mainloop.obj"\
84+
"$(INTDIR)\mbprint.obj"\
8885
"$(INTDIR)\print.obj"\
89-
"$(INTDIR)\describe.obj"\
86+
"$(INTDIR)\prompt.obj"\
9087
"$(INTDIR)\psqlscan.obj"\
88+
"$(INTDIR)\startup.obj"\
89+
"$(INTDIR)\stringutils.obj"\
9190
"$(INTDIR)\tab-complete.obj"\
92-
"$(INTDIR)\sprompt.obj"\
91+
"$(INTDIR)\variables.obj"\
92+
"$(INTDIR)\exec.obj"\
9393
"$(INTDIR)\getopt.obj"\
9494
"$(INTDIR)\getopt_long.obj"\
9595
"$(INTDIR)\path.obj"\
96-
"$(INTDIR)\mbprint.obj"\
96+
"$(INTDIR)\pgstrcasecmp.obj"\
97+
"$(INTDIR)\sprompt.obj"\
9798
"..\..\interfaces\libpq\Release\libpqdll.lib"
9899

99100
"$(OUTDIR)\psql.exe" : "$(OUTDIR)"$(DEF_FILE)$(LINK32_OBJS)
100101
$(LINK32) @<<
101102
$(LINK32_FLAGS) $(LINK32_OBJS)
102103
<<
103104

104-
"$(OUTDIR)\sprompt.obj" :"$(OUTDIR)"..\..\port\sprompt.c
105+
"$(INTDIR)\exec.obj" : ..\..\port\exec.c
105106
$(CPP) @<<
106-
$(CPP_PROJ) ..\..\port\sprompt.c
107+
$(CPP_PROJ) ..\..\port\exec.c
107108
<<
108109

109110
"$(OUTDIR)\getopt.obj" : "$(OUTDIR)" ..\..\port\getopt.c
@@ -126,9 +127,9 @@ LINK32_OBJS= \
126127
$(CPP_PROJ) ..\..\port\pgstrcasecmp.c
127128
<<
128129

129-
"$(INTDIR)\exec.obj" : ..\..\port\exec.c
130+
"$(OUTDIR)\sprompt.obj" :"$(OUTDIR)"..\..\port\sprompt.c
130131
$(CPP) @<<
131-
$(CPP_PROJ) ..\..\port\exec.c
132+
$(CPP_PROJ) ..\..\port\sprompt.c
132133
<<
133134

134135
.c{$(CPP_OBJS)}.obj::

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp