NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commited24461

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 parentfca4519 commited24461Copy full SHA for ed24461

File tree

3 files changed

-276

lines changed

src/interfaces/odbc

3 files changed

-276

lines changed

`‎src/interfaces/odbc/GNUmakefile.in`

Lines changed: 7 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,15 +7,15 @@`
`7`	`7`	`#`
`8`	`8`	`#`
`9`	`9`	`# 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 $`
`11`	`11`	`#`
`12`	`12`	`#-------------------------------------------------------------------------`
`13`	`13`	`@SET_MAKE@`
`14`	`14`
`15`	`15`	`NAME = psqlodbc`
`16`		`-SRCDIR=@srcdir@`
	`16`	`+SRCDIR=@top_srcdir@`
`17`	`17`	`ODBCSRCDIR=@srcdir@`
`18`		`-include $(ODBCSRCDIR)/Makefile.global`
	`18`	`+include $(SRCDIR)/Makefile.global`
`19`	`19`
`20`	`20`	`include Version.mk`
`21`	`21`	`PORTNAME= @PORTNAME@`
`@@ -26,20 +26,17 @@ FIND = @find@`
`26`	`26`	`TAR = @tar@`
`27`	`27`	`SPLIT = @split@`
`28`	`28`
	`29`	`+install-shlib-dep := install-shlib`
	`30`	`+shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)`
	`31`	`+`
`29`	`32`	`ifeq ($(PORTNAME), linux)`
`30`		`- install-shlib-dep := install-shlib`
`31`		`- shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)`
`32`	`33`	`LDFLAGS_SL = -shared -soname lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)`
`33`	`34`	`LDFLAGS_SL += -Bsymbolic $(LDFLAGS) -lc -lm`
`34`		`- CFLAGS += -I. $(CFLAGS_SL)`
`35`	`35`	`endif`
`36`	`36`
`37`	`37`	`ifeq ($(PORTNAME), bsd)`
`38`	`38`	`ifdef BSD_SHLIB`
`39`		`- install-shlib-dep := install-shlib`
`40`		`- shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)`
`41`	`39`	`LDFLAGS_SL = -x -Bshareable -Bforcearchive $(LDFLAGS)`
`42`		`- CFLAGS += -I. $(CFLAGS_SL)`
`43`	`40`	`endif`
`44`	`41`	`endif`
`45`	`42`
`@@ -54,7 +51,7 @@ OBJECTS = info.o bind.o columninfo.o connection.o convert.o drvconn.o \`
`54`	`51`	`pgtypes.o psqlodbc.o qresult.o results.o socket.o parse.o statement.o \`
`55`	`52`	`gpps.o tuple.o tuplelist.o dlg_specific.o $(OBJX)`
`56`	`53`
`57`		`-CFLAGS += @DEFS@`
	`54`	`+CFLAGS +=-I.@DEFS@`
`58`	`55`
`59`	`56`	`all: libpsqlodbc.a $(shlib)`
`60`	`57`

`‎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)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commited24461

File tree

3 files changed

3 files changed

`‎src/interfaces/odbc/GNUmakefile.in`

`‎src/interfaces/odbc/config.h`

`‎src/interfaces/odbc/config.status`

0 commit comments