Skip to content

P
Postgres FD Implementation
Commit e0170510 authored by Bruce Momjian's avatar Bruce Momjian
Browse files
Options

More MS VC and BCC psql compile cleanups.

parent 8efe926b
Show whitespace changes
Inline Side-by-side
Showing with 52 additions and 45 deletions
src/bin/psql/bcc32.mak
View file @ e0170510
...@@ -59,23 +59,25 @@ ALL : sql_help.h psqlscan.c "..\..\port\pg_config_paths.h" "$(OUTDIR)\psql.exe" ...@@ -59,23 +59,25 @@ ALL : sql_help.h psqlscan.c "..\..\port\pg_config_paths.h" "$(OUTDIR)\psql.exe"
CLEAN : CLEAN :
-@erase "$(INTDIR)\command.obj" -@erase "$(INTDIR)\command.obj"
-@erase "$(INTDIR)\common.obj" -@erase "$(INTDIR)\common.obj"
-@erase "$(INTDIR)\copy.obj"
-@erase "$(INTDIR)\describe.obj"
-@erase "$(INTDIR)\help.obj" -@erase "$(INTDIR)\help.obj"
-@erase "$(INTDIR)\input.obj" -@erase "$(INTDIR)\input.obj"
-@erase "$(INTDIR)\stringutils.obj"
-@erase "$(INTDIR)\mainloop.obj"
-@erase "$(INTDIR)\copy.obj"
-@erase "$(INTDIR)\startup.obj"
-@erase "$(INTDIR)\prompt.obj"
-@erase "$(INTDIR)\variables.obj"
-@erase "$(INTDIR)\large_obj.obj" -@erase "$(INTDIR)\large_obj.obj"
-@erase "$(INTDIR)\mainloop.obj"
-@erase "$(INTDIR)\mbprint.obj"
-@erase "$(INTDIR)\print.obj" -@erase "$(INTDIR)\print.obj"
-@erase "$(INTDIR)\describe.obj" -@erase "$(INTDIR)\prompt.obj"
-@erase "$(INTDIR)\startup.obj"
-@erase "$(INTDIR)\stringutils.obj"
-@erase "$(INTDIR)\tab-complete.obj" -@erase "$(INTDIR)\tab-complete.obj"
-@erase "$(INTDIR)\sprompt.obj" -@erase "$(INTDIR)\variables.obj"
-@erase "$(INTDIR)\exec.obj"
-@erase "$(INTDIR)\getopt.obj" -@erase "$(INTDIR)\getopt.obj"
-@erase "$(INTDIR)\getopt_long.obj" -@erase "$(INTDIR)\getopt_long.obj"
-@erase "$(INTDIR)\path.obj" -@erase "$(INTDIR)\path.obj"
-@erase "$(INTDIR)\mbprint.obj" -@erase "$(INTDIR)\pgstrcasecmp.obj"
-@erase "$(INTDIR)\sprompt.obj"
-@erase "$(INTDIR)\psql.ilc" -@erase "$(INTDIR)\psql.ilc"
-@erase "$(INTDIR)\psql.ild" -@erase "$(INTDIR)\psql.ild"
-@erase "$(INTDIR)\psql.tds" -@erase "$(INTDIR)\psql.tds"
...@@ -125,23 +127,25 @@ LINK32_FLAGS=-L$(BCB)\lib;.\$(LIBPG_DIR) -x -v ...@@ -125,23 +127,25 @@ LINK32_FLAGS=-L$(BCB)\lib;.\$(LIBPG_DIR) -x -v
LINK32_OBJS= \ LINK32_OBJS= \
command.obj \ command.obj \
common.obj \ common.obj \
copy.obj \
describe.obj \
help.obj \ help.obj \
input.obj \ input.obj \
stringutils.obj \
mainloop.obj \
copy.obj \
startup.obj \
prompt.obj \
variables.obj \
large_obj.obj \ large_obj.obj \
mainloop.obj \
mbprint.obj
print.obj \ print.obj \
describe.obj \ prompt.obj \
startup.obj \
stringutils.obj \
tab-complete.obj \ tab-complete.obj \
sprompt.obj \ variables.obj \
exec.obj \
getopt.obj \ getopt.obj \
getopt_long.obj \ getopt_long.obj \
path.obj \ path.obj \
mbprint.obj pgstrcasecmp.obj \
sprompt.obj \
"$(OUTDIR)\psql.exe" : "$(OUTDIR)" $(LINK32_OBJS) "$(OUTDIR)\psql.exe" : "$(OUTDIR)" $(LINK32_OBJS)
...@@ -152,10 +156,12 @@ LINK32_OBJS= \ ...@@ -152,10 +156,12 @@ LINK32_OBJS= \
import32.lib $(LIBRARIES),, import32.lib $(LIBRARIES),,
! !
sprompt.obj : "$(OUTDIR)" ..\..\port\sprompt.c exec.obj : "$(OUTDIR)" ..\..\port\exec.c
getopt.obj : "$(OUTDIR)" ..\..\port\getopt.c getopt.obj : "$(OUTDIR)" ..\..\port\getopt.c
getopt_long.obj : "$(OUTDIR)" ..\..\port\getopt_long.c getopt_long.obj : "$(OUTDIR)" ..\..\port\getopt_long.c
path.obj : "$(OUTDIR)" ..\..\port\path.c path.obj : "$(OUTDIR)" ..\..\port\path.c
pgstrcasecmp.obj : "$(OUTDIR)" ..\..\port\pgstrcasecmp.c
sprompt.obj : "$(OUTDIR)" ..\..\port\sprompt.c
"sql_help.h": create_help.pl "sql_help.h": create_help.pl
$(PERL) create_help.pl $(REFDOCDIR) $@ $(PERL) create_help.pl $(REFDOCDIR) $@
......
src/bin/psql/win32.mak
View file @ e0170510
...@@ -22,24 +22,26 @@ ALL : sql_help.h psqlscan.c "..\..\port\pg_config_paths.h" "$(OUTDIR)\psql.exe" ...@@ -22,24 +22,26 @@ ALL : sql_help.h psqlscan.c "..\..\port\pg_config_paths.h" "$(OUTDIR)\psql.exe"
CLEAN : CLEAN :
-@erase "$(INTDIR)\command.obj" -@erase "$(INTDIR)\command.obj"
-@erase "$(INTDIR)\common.obj" -@erase "$(INTDIR)\common.obj"
-@erase "$(INTDIR)\copy.obj"
-@erase "$(INTDIR)\describe.obj"
-@erase "$(INTDIR)\help.obj" -@erase "$(INTDIR)\help.obj"
-@erase "$(INTDIR)\input.obj" -@erase "$(INTDIR)\input.obj"
-@erase "$(INTDIR)\stringutils.obj"
-@erase "$(INTDIR)\mainloop.obj"
-@erase "$(INTDIR)\copy.obj"
-@erase "$(INTDIR)\startup.obj"
-@erase "$(INTDIR)\prompt.obj"
-@erase "$(INTDIR)\variables.obj"
-@erase "$(INTDIR)\large_obj.obj" -@erase "$(INTDIR)\large_obj.obj"
-@erase "$(INTDIR)\mainloop.obj"
-@erase "$(INTDIR)\mbprint.obj"
-@erase "$(INTDIR)\print.obj" -@erase "$(INTDIR)\print.obj"
-@erase "$(INTDIR)\describe.obj" -@erase "$(INTDIR)\prompt.obj"
-@erase "$(INTDIR)\psqlscan.obj" -@erase "$(INTDIR)\psqlscan.obj"
-@erase "$(INTDIR)\startup.obj"
-@erase "$(INTDIR)\stringutils.obj"
-@erase "$(INTDIR)\tab-complete.obj" -@erase "$(INTDIR)\tab-complete.obj"
-@erase "$(INTDIR)\sprompt.obj" -@erase "$(INTDIR)\variables.obj"
-@erase "$(INTDIR)\exec.obj"
-@erase "$(INTDIR)\getopt.obj" -@erase "$(INTDIR)\getopt.obj"
-@erase "$(INTDIR)\getopt_long.obj" -@erase "$(INTDIR)\getopt_long.obj"
-@erase "$(INTDIR)\path.obj" -@erase "$(INTDIR)\path.obj"
-@erase "$(INTDIR)\mbprint.obj" -@erase "$(INTDIR)\pgstrcasecmp.obj"
-@erase "$(INTDIR)\sprompt.obj"
-@erase "$(INTDIR)\*psql.pch" -@erase "$(INTDIR)\*psql.pch"
-@erase "$(OUTDIR)\psql.exe" -@erase "$(OUTDIR)\psql.exe"
-@erase "$(INTDIR)\..\..\port\pg_config_paths.h" -@erase "$(INTDIR)\..\..\port\pg_config_paths.h"
...@@ -60,8 +62,7 @@ CLEAN : ...@@ -60,8 +62,7 @@ CLEAN :
CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D\ CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D\
"_MBCS" /Fp"$(INTDIR)\psql.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \ "_MBCS" /Fp"$(INTDIR)\psql.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \
/I ..\..\include /I ..\..\interfaces\libpq /I ..\..\include\port\win32 \ /I ..\..\include /I ..\..\interfaces\libpq /D "HAVE_STRDUP" /D "FRONTEND"
/D "HAVE_STRDUP" /D "FRONTEND"
CPP_OBJS=.\Release/ CPP_OBJS=.\Release/
CPP_SBRS=. CPP_SBRS=.
...@@ -72,28 +73,28 @@ LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\ ...@@ -72,28 +73,28 @@ LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
odbccp32.lib wsock32.lib /nologo /subsystem:console /incremental:no\ odbccp32.lib wsock32.lib /nologo /subsystem:console /incremental:no\
/pdb:"$(OUTDIR)\psql.pdb" /machine:I386 /out:"$(OUTDIR)\psql.exe" /pdb:"$(OUTDIR)\psql.pdb" /machine:I386 /out:"$(OUTDIR)\psql.exe"
LINK32_OBJS= \ LINK32_OBJS= \
"$(INTDIR)\pgstrcasecmp.obj" \
"$(INTDIR)\exec.obj" \
"$(INTDIR)\command.obj" \ "$(INTDIR)\command.obj" \
"$(INTDIR)\common.obj" \ "$(INTDIR)\common.obj" \
"$(INTDIR)\copy.obj" \
"$(INTDIR)\describe.obj" \
"$(INTDIR)\help.obj" \ "$(INTDIR)\help.obj" \
"$(INTDIR)\input.obj" \ "$(INTDIR)\input.obj" \
"$(INTDIR)\stringutils.obj" \
"$(INTDIR)\mainloop.obj" \
"$(INTDIR)\copy.obj" \
"$(INTDIR)\startup.obj" \
"$(INTDIR)\prompt.obj" \
"$(INTDIR)\variables.obj" \
"$(INTDIR)\large_obj.obj" \ "$(INTDIR)\large_obj.obj" \
"$(INTDIR)\mainloop.obj" \
"$(INTDIR)\mbprint.obj" \
"$(INTDIR)\print.obj" \ "$(INTDIR)\print.obj" \
"$(INTDIR)\describe.obj" \ "$(INTDIR)\prompt.obj" \
"$(INTDIR)\psqlscan.obj" \ "$(INTDIR)\psqlscan.obj" \
"$(INTDIR)\startup.obj" \
"$(INTDIR)\stringutils.obj" \
"$(INTDIR)\tab-complete.obj" \ "$(INTDIR)\tab-complete.obj" \
"$(INTDIR)\sprompt.obj" \ "$(INTDIR)\variables.obj" \
"$(INTDIR)\exec.obj" \
"$(INTDIR)\getopt.obj" \ "$(INTDIR)\getopt.obj" \
"$(INTDIR)\getopt_long.obj" \ "$(INTDIR)\getopt_long.obj" \
"$(INTDIR)\path.obj" \ "$(INTDIR)\path.obj" \
"$(INTDIR)\mbprint.obj" \ "$(INTDIR)\pgstrcasecmp.obj" \
"$(INTDIR)\sprompt.obj" \
"..\..\interfaces\libpq\Release\libpqdll.lib" "..\..\interfaces\libpq\Release\libpqdll.lib"
"$(OUTDIR)\psql.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) "$(OUTDIR)\psql.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
...@@ -101,9 +102,9 @@ LINK32_OBJS= \ ...@@ -101,9 +102,9 @@ LINK32_OBJS= \
$(LINK32_FLAGS) $(LINK32_OBJS) $(LINK32_FLAGS) $(LINK32_OBJS)
<< <<
"$(OUTDIR)\sprompt.obj" : "$(OUTDIR)" ..\..\port\sprompt.c "$(INTDIR)\exec.obj" : ..\..\port\exec.c
$(CPP) @<< $(CPP) @<<
$(CPP_PROJ) ..\..\port\sprompt.c $(CPP_PROJ) ..\..\port\exec.c
<< <<
"$(OUTDIR)\getopt.obj" : "$(OUTDIR)" ..\..\port\getopt.c "$(OUTDIR)\getopt.obj" : "$(OUTDIR)" ..\..\port\getopt.c
...@@ -126,9 +127,9 @@ LINK32_OBJS= \ ...@@ -126,9 +127,9 @@ LINK32_OBJS= \
$(CPP_PROJ) ..\..\port\pgstrcasecmp.c $(CPP_PROJ) ..\..\port\pgstrcasecmp.c
<< <<
"$(INTDIR)\exec.obj" : ..\..\port\exec.c "$(OUTDIR)\sprompt.obj" : "$(OUTDIR)" ..\..\port\sprompt.c
$(CPP) @<< $(CPP) @<<
$(CPP_PROJ) ..\..\port\exec.c $(CPP_PROJ) ..\..\port\sprompt.c
<< <<
.c{$(CPP_OBJS)}.obj:: .c{$(CPP_OBJS)}.obj::
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment