Realign libpq and psql for need for path.c under Win32 VC and BCC.

This commit is contained in:
Bruce Momjian 2004-09-01 23:35:16 +00:00
parent bd9b951191
commit 4fa8b44749
3 changed files with 8 additions and 11 deletions

View File

@ -53,7 +53,7 @@ REFDOCDIR=../../../doc/src/sgml/ref
.c.obj:
$(CPP) -o"$(INTDIR)\$&" $(CPP_PROJ) $<
ALL : "sql_help.h" "$(OUTDIR)\psql.exe"
ALL : sql_help.h pg_config_paths.h "$(OUTDIR)\psql.exe"
CLEAN :
-@erase "$(INTDIR)\command.obj"
@ -82,6 +82,9 @@ CLEAN :
-@erase "$(INTDIR)\psql.ilf"
-@erase "$(OUTDIR)\psql.exe"
pg_config_paths.h: win32.mak
echo #define SYSCONFDIR "" >pg_config_paths.h
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

View File

@ -16,7 +16,7 @@ REFDOCDIR= ../../../doc/src/sgml/ref
OutDir=.\Release
# End Custom Macros
ALL : sql_help.h "$(OUTDIR)\psql.exe"
ALL : sql_help.h pg_config_paths.h "$(OUTDIR)\psql.exe"
CLEAN :
-@erase "$(INTDIR)\command.obj"
@ -42,6 +42,9 @@ CLEAN :
-@erase "$(INTDIR)\*psql.pch"
-@erase "$(OUTDIR)\psql.exe"
pg_config_paths.h: win32.mak
echo #define SYSCONFDIR "" >pg_config_paths.h
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

View File

@ -67,7 +67,6 @@ LIB32_OBJS= \
"$(INTDIR)\thread.obj" \
"$(INTDIR)\inet_aton.obj" \
"$(INTDIR)\crypt.obj" \
"$(INTDIR)\path.obj" \
"$(INTDIR)\noblock.obj" \
"$(INTDIR)\pgstrcasecmp.obj" \
"$(INTDIR)\dllist.obj" \
@ -93,13 +92,6 @@ RSC_PROJ=-l 0x409 -i$(BCB)\include -fo"$(INTDIR)\libpq.res"
LINK32=ilink32.exe
LINK32_FLAGS = -Gn -L$(BCB)\lib;$(INTDIR); -x -Tpd -v
LINK32_OBJS= "$(INTDIR)\libpqdll.obj"
# ---------------------------------------------------------------------------
.path.obj = $(INTDIR)
.path.c = .;..\..\port;..\..\backend\libpq;..\..\backend\lib;..\..\backend\utils\mb
# ---------------------------------------------------------------------------
ALL: config "$(OUTDIR)" "$(OUTDIR)\blibpq.dll" "$(OUTDIR)\blibpq.lib"
@ -108,7 +100,6 @@ CLEAN :
-@erase "$(INTDIR)\thread.obj"
-@erase "$(INTDIR)\inet_aton.obj"
-@erase "$(INTDIR)\crypt.obj"
-@erase "$(INTDIR)\path.obj"
-@erase "$(INTDIR)\dllist.obj"
-@erase "$(INTDIR)\md5.obj"
-@erase "$(INTDIR)\ip.obj"