git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

Don't define FRONTEND for ecpg libraries

author Andres Freund <andres@anarazel.de>

2022年8月23日 03:39:30 +0000 (20:39 -0700)

committer Andres Freund <andres@anarazel.de>

2022年8月23日 03:39:30 +0000 (20:39 -0700)

Not needed anymore after 7143b3e8213.

Discussion: https://postgr.es/m/20220820194550.725755r6fj2ro3rx@awork3.anarazel.de

src/interfaces/ecpg/compatlib/Makefile patch | blob | blame | history

src/interfaces/ecpg/ecpglib/Makefile patch | blob | blame | history

src/interfaces/ecpg/pgtypeslib/Makefile patch | blob | blame | history

src/tools/msvc/Mkvcbuild.pm patch | blob | blame | history

diff --git a/src/interfaces/ecpg/compatlib/Makefile b/src/interfaces/ecpg/compatlib/Makefile

index 867ad55539aaf16a3e0df404e83a2fcd35065c9e..62b8a8c12cc71f67025483ccd1b54ece3bec42e0 100644 (file)

--- a/src/interfaces/ecpg/compatlib/Makefile

+++ b/src/interfaces/ecpg/compatlib/Makefile

@@ -19,7 +19,7 @@ SO_MAJOR_VERSION= 3

SO_MINOR_VERSION= $(MAJORVERSION)

override CPPFLAGS := -I../include -I$(top_srcdir)/src/interfaces/ecpg/include \

- -I$(libpq_srcdir) -DFRONTEND $(CPPFLAGS)

+ -I$(libpq_srcdir) $(CPPFLAGS)

override CFLAGS += $(PTHREAD_CFLAGS)

SHLIB_LINK_INTERNAL = -L../ecpglib -lecpg -L../pgtypeslib -lpgtypes $(libpq_pgport_shlib)

diff --git a/src/interfaces/ecpg/ecpglib/Makefile b/src/interfaces/ecpg/ecpglib/Makefile

index b00229f3fec983180aad8d807d8dda0074611a3a..844fc6eb6eceab566cfa7b93ed71eb65554433c7 100644 (file)

--- a/src/interfaces/ecpg/ecpglib/Makefile

+++ b/src/interfaces/ecpg/ecpglib/Makefile

@@ -19,7 +19,7 @@ SO_MAJOR_VERSION= 6

SO_MINOR_VERSION= $(MAJORVERSION)

override CPPFLAGS := -I../include -I$(top_srcdir)/src/interfaces/ecpg/include \

- -I$(libpq_srcdir) -I$(top_builddir)/src/port -DFRONTEND $(CPPFLAGS)

+ -I$(libpq_srcdir) -I$(top_builddir)/src/port $(CPPFLAGS)

override CFLAGS += $(PTHREAD_CFLAGS)

OBJS = \

diff --git a/src/interfaces/ecpg/pgtypeslib/Makefile b/src/interfaces/ecpg/pgtypeslib/Makefile

index 763787f22da90dcdec7e1239c0c6baecebfb3493..13ef992ee720bb0042ea2c6709f7bdb1f7b6174c 100644 (file)

--- a/src/interfaces/ecpg/pgtypeslib/Makefile

+++ b/src/interfaces/ecpg/pgtypeslib/Makefile

@@ -19,7 +19,7 @@ SO_MAJOR_VERSION= 3

SO_MINOR_VERSION= $(MAJORVERSION)

override CPPFLAGS := -I../include -I$(top_srcdir)/src/interfaces/ecpg/include \

- -DFRONTEND $(CPPFLAGS)

+ $(CPPFLAGS)

override CFLAGS += $(PTHREAD_CFLAGS)

SHLIB_LINK_INTERNAL = -lpgcommon_shlib -lpgport_shlib

diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm

index 156428d908e8f5f2d9805c486622008ea4b051b2..9d41f9aef864532de9cb33ceec23df7714697329 100644 (file)

--- a/src/tools/msvc/Mkvcbuild.pm

+++ b/src/tools/msvc/Mkvcbuild.pm

@@ -315,14 +315,12 @@ sub mkvcbuild

my $pgtypes = $solution->AddProject(

'libpgtypes', 'dll',

'interfaces', 'src/interfaces/ecpg/pgtypeslib');

- $pgtypes->AddDefine('FRONTEND');

$pgtypes->AddReference($libpgcommon, $libpgport);

$pgtypes->UseDef('src/interfaces/ecpg/pgtypeslib/pgtypeslib.def');

$pgtypes->AddIncludeDir('src/interfaces/ecpg/include');

my $libecpg = $solution->AddProject('libecpg', 'dll', 'interfaces',

'src/interfaces/ecpg/ecpglib');

- $libecpg->AddDefine('FRONTEND');

$libecpg->AddIncludeDir('src/interfaces/ecpg/include');

$libecpg->AddIncludeDir('src/interfaces/libpq');

$libecpg->AddIncludeDir('src/port');

@@ -333,7 +331,6 @@ sub mkvcbuild

my $libecpgcompat = $solution->AddProject(

'libecpg_compat', 'dll',

'interfaces', 'src/interfaces/ecpg/compatlib');

- $libecpgcompat->AddDefine('FRONTEND');

$libecpgcompat->AddIncludeDir('src/interfaces/ecpg/include');

$libecpgcompat->AddIncludeDir('src/interfaces/libpq');

$libecpgcompat->UseDef('src/interfaces/ecpg/compatlib/compatlib.def');

This is the main PostgreSQL git repository.

RSS Atom