Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit ed24461

Browse files
author
Thomas G. Lockhart
committed
Clean up for configuration from the Postgres main configure script.
 Use @top-srcdir@ to find the right Makefile.global and use ODBCSRCDIR to point to this local directory. Move non-platform-specific stuff to outside the if clauses. Still need to move all platform-specific stuff to the templates.
1 parent fca4519 commit ed24461

File tree

3 files changed

+7
-276
lines changed

3 files changed

+7
-276
lines changed

‎src/interfaces/odbc/GNUmakefile.in

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile.in,v 1.1 1998/10/06 05:57:56 thomas Exp $
10+
# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile.in,v 1.2 1998/10/07 06:49:19 thomas Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313
@SET_MAKE@
1414

1515
NAME = psqlodbc
16-
SRCDIR=@srcdir@
16+
SRCDIR=@top_srcdir@
1717
ODBCSRCDIR=@srcdir@
18-
include $(ODBCSRCDIR)/Makefile.global
18+
include $(SRCDIR)/Makefile.global
1919

2020
include Version.mk
2121
PORTNAME= @PORTNAME@
@@ -26,20 +26,17 @@ FIND = @find@
2626
TAR = @tar@
2727
SPLIT = @split@
2828

29+
install-shlib-dep := install-shlib
30+
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
31+
2932
ifeq ($(PORTNAME), linux)
30-
install-shlib-dep := install-shlib
31-
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
3233
LDFLAGS_SL = -shared -soname lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
3334
LDFLAGS_SL += -Bsymbolic $(LDFLAGS) -lc -lm
34-
CFLAGS += -I. $(CFLAGS_SL)
3535
endif
3636

3737
ifeq ($(PORTNAME), bsd)
3838
ifdef BSD_SHLIB
39-
install-shlib-dep := install-shlib
40-
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
4139
LDFLAGS_SL = -x -Bshareable -Bforcearchive $(LDFLAGS)
42-
CFLAGS += -I. $(CFLAGS_SL)
4340
endif
4441
endif
4542

@@ -54,7 +51,7 @@ OBJECTS = info.o bind.o columninfo.o connection.o convert.o drvconn.o \
5451
pgtypes.o psqlodbc.o qresult.o results.o socket.o parse.o statement.o \
5552
gpps.o tuple.o tuplelist.o dlg_specific.o $(OBJX)
5653

57-
CFLAGS += @DEFS@
54+
CFLAGS += -I. @DEFS@
5855

5956
all: libpsqlodbc.a $(shlib)
6057

‎src/interfaces/odbc/config.h

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎src/interfaces/odbc/config.status

Lines changed: 0 additions & 261 deletions
This file was deleted.

0 commit comments

Comments
 (0)