Commit4fa8b44

committed

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

1 parentbd9b951 commit4fa8b44Copy full SHA for 4fa8b44

File tree

-11

lines changed

-11

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ REFDOCDIR=../../../doc/src/sgml/ref`
`53`	`53`	`.c.obj:`
`54`	`54`	`$(CPP) -o"$(INTDIR)\$&"$(CPP_PROJ)$<`
`55`	`55`
`56`		`-ALL :"sql_help.h" "$(OUTDIR)\psql.exe"`
	`56`	`+ALL : sql_help.h pg_config_paths.h "$(OUTDIR)\psql.exe"`
`57`	`57`
`58`	`58`	`CLEAN :`
`59`	`59`	`-@erase"$(INTDIR)\command.obj"`
`@@ -82,6 +82,9 @@ CLEAN :`
`82`	`82`	`-@erase"$(INTDIR)\psql.ilf"`
`83`	`83`	`-@erase"$(OUTDIR)\psql.exe"`
`84`	`84`
	`85`	`+pg_config_paths.h: win32.mak`
	`86`	`+echo#define SYSCONFDIR "" >pg_config_paths.h`
	`87`	`+`
`85`	`88`	`"$(OUTDIR)" :`
`86`	`89`	`if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"`
`87`	`90`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ REFDOCDIR= ../../../doc/src/sgml/ref`
`16`	`16`	`OutDir=.\Release`
`17`	`17`	`# End Custom Macros`
`18`	`18`
`19`		`-ALL : sql_help.h "$(OUTDIR)\psql.exe"`
	`19`	`+ALL : sql_help.hpg_config_paths.h"$(OUTDIR)\psql.exe"`
`20`	`20`
`21`	`21`	`CLEAN :`
`22`	`22`	`-@erase"$(INTDIR)\command.obj"`
`@@ -42,6 +42,9 @@ CLEAN :`
`42`	`42`	`-@erase"$(INTDIR)\*psql.pch"`
`43`	`43`	`-@erase"$(OUTDIR)\psql.exe"`
`44`	`44`
	`45`	`+pg_config_paths.h: win32.mak`
	`46`	`+echo#define SYSCONFDIR "" >pg_config_paths.h`
	`47`	`+`
`45`	`48`	`"$(OUTDIR)" :`
`46`	`49`	`if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"`
`47`	`50`

Lines changed: 0 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,6 @@ LIB32_OBJS= \`
`67`	`67`	`"$(INTDIR)\thread.obj"\`
`68`	`68`	`"$(INTDIR)\inet_aton.obj"\`
`69`	`69`	`"$(INTDIR)\crypt.obj"\`
`70`		`-"$(INTDIR)\path.obj"\`
`71`	`70`	`"$(INTDIR)\noblock.obj"\`
`72`	`71`	`"$(INTDIR)\pgstrcasecmp.obj"\`
`73`	`72`	`"$(INTDIR)\dllist.obj"\`
`@@ -93,13 +92,6 @@ RSC_PROJ=-l 0x409 -i$(BCB)\include -fo"$(INTDIR)\libpq.res"`
`93`	`92`	`LINK32=ilink32.exe`
`94`	`93`	`LINK32_FLAGS = -Gn -L$(BCB)\lib;$(INTDIR); -x -Tpd -v`
`95`	`94`	`LINK32_OBJS= "$(INTDIR)\libpqdll.obj"`
`96`		`-`
`97`		`-# ---------------------------------------------------------------------------`
`98`		`-`
`99`		`-.path.obj =$(INTDIR)`
`100`		`-.path.c = .;..\..\port;..\..\backend\libpq;..\..\backend\lib;..\..\backend\utils\mb`
`101`		`-`
`102`		`-# ---------------------------------------------------------------------------`
`103`	`95`
`104`	`96`	`ALL: config "$(OUTDIR)" "$(OUTDIR)\blibpq.dll" "$(OUTDIR)\blibpq.lib"`
`105`	`97`
`@@ -108,7 +100,6 @@ CLEAN :`
`108`	`100`	`-@erase"$(INTDIR)\thread.obj"`
`109`	`101`	`-@erase"$(INTDIR)\inet_aton.obj"`
`110`	`102`	`-@erase"$(INTDIR)\crypt.obj"`
`111`		`--@erase"$(INTDIR)\path.obj"`
`112`	`103`	`-@erase"$(INTDIR)\dllist.obj"`
`113`	`104`	`-@erase"$(INTDIR)\md5.obj"`
`114`	`105`	`-@erase"$(INTDIR)\ip.obj"`

Comments

(0)