Add missing sprompt.obj psql usage for Borland compiler, per private

report from krizsan.

Backpatch to 7.4.X.

diff --git a/src/bin/psql/bcc32.mak b/src/bin/psql/bcc32.mak
index 7df1f664e8f4d4fe3e0c1a1854c8d36b4612be03..fa0c9ef1f1d81ce50f99ab3ccfb8531517986891 100644 (file)
--- a/src/bin/psql/bcc32.mak
+++ b/src/bin/psql/bcc32.mak
@@ -70,6 +70,7 @@ CLEAN :
        -@erase "$(INTDIR)\print.obj"
        -@erase "$(INTDIR)\describe.obj"
        -@erase "$(INTDIR)\tab-complete.obj"
+       -@erase "$(INTDIR)\sprompt.obj"
        -@erase "$(INTDIR)\getopt.obj"
        -@erase "$(INTDIR)\getopt_long.obj"
        -@erase "$(INTDIR)\path.obj"
@@ -123,9 +124,10 @@ LINK32_OBJS= \
        print.obj \
        describe.obj \
        tab-complete.obj \
+       sprompt.obj \
        getopt.obj \
-      getopt_long.obj \
-      path.obj \
+       getopt_long.obj \
+       path.obj \
        mbprint.obj
        
 
@@ -137,6 +139,7 @@ LINK32_OBJS= \
        import32.lib $(LIBRARIES),,
 !
 
+sprompt.obj : "$(OUTDIR)" ..\..\port\sprompt.c
 getopt.obj : "$(OUTDIR)" ..\..\port\getopt.c
 getopt_long.obj : "$(OUTDIR)" ..\..\port\getopt_long.c
 path.obj : "$(OUTDIR)" ..\..\port\path.c

diff --git a/src/interfaces/libpq/bcc32.mak b/src/interfaces/libpq/bcc32.mak
index ec7fe8519895056136397bacd691bb1cdd11b315..07bed5a328f5e55038bf5b62dcebd1eb9c663b98 100644 (file)
--- a/src/interfaces/libpq/bcc32.mak
+++ b/src/interfaces/libpq/bcc32.mak
@@ -64,6 +64,7 @@ LIB32_FLAGS=
 LIB32_OBJS= \
        "$(OUTDIR)\win32.obj" \
        "$(INTDIR)\getaddrinfo.obj" \
+       "$(INTDIR)\thread.obj" \
        "$(INTDIR)\inet_aton.obj" \
        "$(INTDIR)\crypt.obj" \
        "$(INTDIR)\path.obj" \
@@ -79,7 +80,6 @@ LIB32_OBJS= \
        "$(INTDIR)\fe-misc.obj" \
        "$(INTDIR)\fe-print.obj" \
        "$(INTDIR)\fe-secure.obj" \
-       "$(INTDIR)\thread.obj" \
        "$(INTDIR)\pqexpbuffer.obj" \
        "$(INTDIR)\wchar.obj" \
        "$(INTDIR)\encnames.obj"
@@ -102,6 +102,7 @@ ALL: "$(OUTDIR)" "$(OUTDIR)\blibpq.dll" "$(OUTDIR)\blibpq.lib"
 
 CLEAN :
        -@erase "$(INTDIR)\getaddrinfo.obj"
+       -@erase "$(INTDIR)\thread.obj"
        -@erase "$(INTDIR)\inet_aton.obj"
        -@erase "$(INTDIR)\crypt.obj"
        -@erase "$(INTDIR)\path.obj"
@@ -117,7 +118,6 @@ CLEAN :
        -@erase "$(INTDIR)\fe-misc.obj"
        -@erase "$(INTDIR)\fe-print.obj"
        -@erase "$(INTDIR)\fe-secure.obj"
-       -@erase "$(INTDIR)\thread.obj"
        -@erase "$(INTDIR)\pqexpbuffer.obj"
        -@erase "$(OUTDIR)\libpqdll.obj"
        -@erase "$(OUTDIR)\win32.obj"