This is an automated email from the ASF dual-hosted git repository.
chenjinbao1989 pushed a commit to branch cbdb-postgres-merge
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
The following commit(s) were added to refs/heads/cbdb-postgres-merge by this
push:
new c1bbc839a81 Fix some conflict for GNUmakefile
c1bbc839a81 is described below
commit c1bbc839a81b3d1443dc5be804f01dc390c5c57a
Author: Jinbao Chen <[email protected]>
AuthorDate: Sun Sep 14 15:07:26 2025 +0800
Fix some conflict for GNUmakefile
---
GNUmakefile.in | 27 +--------------------------
src/backend/Makefile | 8 ++++----
2 files changed, 5 insertions(+), 30 deletions(-)
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 5e170cee0b6..2f1dd4c558a 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -10,7 +10,6 @@ include $(top_builddir)/src/Makefile.global
$(call recurse,all install,src config)
-<<<<<<< HEAD
all:
$(MAKE) -C contrib/auto_explain all
$(MAKE) -C contrib/citext all
@@ -46,12 +45,6 @@ docs:
$(call recurse,world,doc src config contrib gpcontrib,all)
world:
+@echo "PostgreSQL, contrib, and documentation successfully made. Ready
to install."
-=======
-docs:
- $(MAKE) -C doc all
-
-$(call recurse,world,doc src config contrib,all)
->>>>>>> REL_16_9
# build src/ before contrib/
world-contrib-recurse: world-src-recurse
@@ -64,7 +57,6 @@ world-bin-contrib-recurse: world-bin-src-recurse
html man:
$(MAKE) -C doc $@
-<<<<<<< HEAD
install:
$(MAKE) -C contrib/auto_explain $@
$(MAKE) -C contrib/citext $@
@@ -100,26 +92,11 @@ install-docs:
$(call recurse,install-world,doc src config contrib gpcontrib,install)
install-world:
+@echo "PostgreSQL, contrib, and documentation installation complete."
-=======
-install-docs:
- $(MAKE) -C doc install
-
-$(call recurse,install-world,doc src config contrib,install)
->>>>>>> REL_16_9
# build src/ before contrib/
install-world-contrib-recurse: install-world-src-recurse
-<<<<<<< HEAD
$(call recurse,install-world-bin,src config contrib gpcontrib,install)
-=======
-$(call recurse,install-world-bin,src config contrib,install)
-
-# build src/ before contrib/
-install-world-bin-contrib-recurse: install-world-bin-src-recurse
-
-$(call recurse,installdirs uninstall init-po update-po,doc src config)
->>>>>>> REL_16_9
# build src/ before contrib/
install-world-bin-contrib-recurse: install-world-bin-src-recurse
@@ -176,7 +153,6 @@ check-tests installcheck installcheck-parallel
installcheck-tests: CHECKPREP_TOP
check-tests installcheck installcheck-parallel installcheck-tests:
submake-generated-headers
$(MAKE) -C src/test/regress $@
-<<<<<<< HEAD
check:
if [ ! -f $(prefix)/greenplum_path.sh ]; then \
$(MAKE) -C $(top_builddir) install; \
@@ -220,12 +196,11 @@ endif
ICW_TARGETS += gpcontrib gpMgmt/bin
$(call recurse,installcheck-world,src/test src/pl src/interfaces/ecpg
$(ICW_TARGETS) src/bin,installcheck)
-=======
+
$(call recurse,check-world,src/test src/pl src/interfaces contrib src/bin
src/tools/pg_bsd_indent,check)
$(call recurse,checkprep, src/test src/pl src/interfaces contrib src/bin)
$(call recurse,installcheck-world,src/test src/pl src/interfaces contrib
src/bin,installcheck)
->>>>>>> REL_16_9
$(call recurse,install-tests,src/test/regress,install-tests)
# GPDB: Postgres disables the SSL tests during ICW because of the TCP port that
diff --git a/src/backend/Makefile b/src/backend/Makefile
index 601b2ef4710..3b07e9b435e 100644
--- a/src/backend/Makefile
+++ b/src/backend/Makefile
@@ -168,12 +168,12 @@ submake-catalog-headers:
$(MAKE) -C catalog distprep generated-header-symlinks
# run this unconditionally to avoid needing to know its dependencies here:
-#submake-nodes-headers:
-# $(MAKE) -C nodes distprep generated-header-symlinks
+submake-nodes-headers:
+ $(MAKE) -C nodes distprep generated-header-symlinks
# run this unconditionally to avoid needing to know its dependencies here:
-#submake-utils-headers:
-# $(MAKE) -C utils distprep generated-header-symlinks
+submake-utils-headers:
+ $(MAKE) -C utils distprep generated-header-symlinks
.PHONY: submake-catalog-headers submake-nodes-headers submake-utils-headers
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
