From 773e8b25bd4b2a71d256ecfea0366d3670302f31 Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Mon, 13 May 2024 16:01:16 -0700 Subject: [PATCH v2 2/2] WIP: Set BUILDING_DLL universally That's done with meson already. We probably should rename it, it's quite misleading. --- src/makefiles/Makefile.cygwin | 28 ---------------------------- src/makefiles/Makefile.win32 | 28 ---------------------------- src/Makefile.global.in | 28 ++++++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 56 deletions(-) diff --git a/src/makefiles/Makefile.cygwin b/src/makefiles/Makefile.cygwin index 77593972638..68b98ef06b7 100644 --- a/src/makefiles/Makefile.cygwin +++ b/src/makefiles/Makefile.cygwin @@ -12,34 +12,6 @@ LIBS:=$(filter-out -lm -lc, $(LIBS)) override CPPFLAGS += -DWIN32_STACK_RLIMIT=$(WIN32_STACK_RLIMIT) -ifneq (,$(findstring backend,$(subdir))) -ifeq (,$(findstring conversion_procs,$(subdir))) -ifeq (,$(findstring libpqwalreceiver,$(subdir))) -ifeq (,$(findstring replication/pgoutput,$(subdir))) -ifeq (,$(findstring snowball,$(subdir))) -override CPPFLAGS+= -DBUILDING_DLL -endif -endif -endif -endif -endif - -ifneq (,$(findstring src/common,$(subdir))) -override CPPFLAGS+= -DBUILDING_DLL -endif - -ifneq (,$(findstring src/port,$(subdir))) -override CPPFLAGS+= -DBUILDING_DLL -endif - -ifneq (,$(findstring timezone,$(subdir))) -override CPPFLAGS+= -DBUILDING_DLL -endif - -ifneq (,$(findstring ecpg/ecpglib,$(subdir))) -override CPPFLAGS+= -DBUILDING_DLL -endif - # required by Python headers ifneq (,$(findstring src/pl/plpython,$(subdir))) override CPPFLAGS+= -DUSE_DL_IMPORT diff --git a/src/makefiles/Makefile.win32 b/src/makefiles/Makefile.win32 index dc1aafa115a..fe13aae1e3f 100644 --- a/src/makefiles/Makefile.win32 +++ b/src/makefiles/Makefile.win32 @@ -10,34 +10,6 @@ endif override CPPFLAGS += -DWIN32_STACK_RLIMIT=$(WIN32_STACK_RLIMIT) -ifneq (,$(findstring backend,$(subdir))) -ifeq (,$(findstring conversion_procs,$(subdir))) -ifeq (,$(findstring libpqwalreceiver,$(subdir))) -ifeq (,$(findstring replication/pgoutput,$(subdir))) -ifeq (,$(findstring snowball,$(subdir))) -override CPPFLAGS+= -DBUILDING_DLL -endif -endif -endif -endif -endif - -ifneq (,$(findstring src/common,$(subdir))) -override CPPFLAGS+= -DBUILDING_DLL -endif - -ifneq (,$(findstring src/port,$(subdir))) -override CPPFLAGS+= -DBUILDING_DLL -endif - -ifneq (,$(findstring timezone,$(subdir))) -override CPPFLAGS+= -DBUILDING_DLL -endif - -ifneq (,$(findstring ecpg/ecpglib,$(subdir))) -override CPPFLAGS+= -DBUILDING_DLL -endif - # required by Python headers ifneq (,$(findstring src/pl/plpython,$(subdir))) override CPPFLAGS+= -DUSE_DL_IMPORT diff --git a/src/Makefile.global.in b/src/Makefile.global.in index a00c909681e..3c35aa5ee68 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -1118,3 +1118,31 @@ rm -rf '$(DESTDIR)${bitcodedir}/$(1)/' rm -f '$(DESTDIR)${bitcodedir}/$(1).index.bc' endef + +ifneq (,$(findstring backend,$(subdir))) +ifeq (,$(findstring conversion_procs,$(subdir))) +ifeq (,$(findstring libpqwalreceiver,$(subdir))) +ifeq (,$(findstring replication/pgoutput,$(subdir))) +ifeq (,$(findstring snowball,$(subdir))) +override CPPFLAGS+= -DBUILDING_DLL +endif +endif +endif +endif +endif + +ifneq (,$(findstring src/common,$(subdir))) +override CPPFLAGS+= -DBUILDING_DLL +endif + +ifneq (,$(findstring src/port,$(subdir))) +override CPPFLAGS+= -DBUILDING_DLL +endif + +ifneq (,$(findstring timezone,$(subdir))) +override CPPFLAGS+= -DBUILDING_DLL +endif + +ifneq (,$(findstring ecpg/ecpglib,$(subdir))) +override CPPFLAGS+= -DBUILDING_DLL +endif -- 2.44.0.279.g3bd955d269