From b66c47fc317cc4079f475c543bb9ba1d14a98391 Mon Sep 17 00:00:00 2001
From: Arseny Sher <sher-ars@yandex.ru>
Date: Wed, 6 Dec 2023 10:08:51 +0300
Subject: [PATCH] Revert temp makefile changes.

---
 Makefile | 43 +++++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/Makefile b/Makefile
index 840519713e..3bf63006d0 100644
--- a/Makefile
+++ b/Makefile
@@ -125,33 +125,32 @@ postgres-clean-%:
 postgres-check-%: postgres-%
 	$(MAKE) -C $(POSTGRES_INSTALL_DIR)/build/$* MAKELEVEL=0 check
 
-.PHONY: neon-pg-ext-%
-neon-pg-ext-%: # postgres-%
+neon-pg-ext-%: postgres-%
 	+@echo "Compiling neon $*"
 	mkdir -p $(POSTGRES_INSTALL_DIR)/build/neon-$*
 	$(MAKE) PG_CONFIG=$(POSTGRES_INSTALL_DIR)/$*/bin/pg_config CFLAGS='$(PG_CFLAGS) $(COPT)' \
 		-C $(POSTGRES_INSTALL_DIR)/build/neon-$* \
 		-f $(ROOT_PROJECT_DIR)/pgxn/neon/Makefile install
-	# +@echo "Compiling neon_walredo $*"
-	# mkdir -p $(POSTGRES_INSTALL_DIR)/build/neon-walredo-$*
-	# $(MAKE) PG_CONFIG=$(POSTGRES_INSTALL_DIR)/$*/bin/pg_config CFLAGS='$(PG_CFLAGS) $(COPT)' \
-	# 	-C $(POSTGRES_INSTALL_DIR)/build/neon-walredo-$* \
-	# 	-f $(ROOT_PROJECT_DIR)/pgxn/neon_walredo/Makefile install
-	# +@echo "Compiling neon_rmgr $*"
-	# mkdir -p $(POSTGRES_INSTALL_DIR)/build/neon-rmgr-$*
-	# $(MAKE) PG_CONFIG=$(POSTGRES_INSTALL_DIR)/$*/bin/pg_config CFLAGS='$(PG_CFLAGS) $(COPT)' \
-	# 	-C $(POSTGRES_INSTALL_DIR)/build/neon-rmgr-$* \
-	# 	-f $(ROOT_PROJECT_DIR)/pgxn/neon_rmgr/Makefile install
-	# +@echo "Compiling neon_test_utils $*"
-	# mkdir -p $(POSTGRES_INSTALL_DIR)/build/neon-test-utils-$*
-	# $(MAKE) PG_CONFIG=$(POSTGRES_INSTALL_DIR)/$*/bin/pg_config CFLAGS='$(PG_CFLAGS) $(COPT)' \
-	# 	-C $(POSTGRES_INSTALL_DIR)/build/neon-test-utils-$* \
-	# 	-f $(ROOT_PROJECT_DIR)/pgxn/neon_test_utils/Makefile install
-	# +@echo "Compiling neon_utils $*"
-	# mkdir -p $(POSTGRES_INSTALL_DIR)/build/neon-utils-$*
-	# $(MAKE) PG_CONFIG=$(POSTGRES_INSTALL_DIR)/$*/bin/pg_config CFLAGS='$(PG_CFLAGS) $(COPT)' \
-	# 	-C $(POSTGRES_INSTALL_DIR)/build/neon-utils-$* \
-	# 	-f $(ROOT_PROJECT_DIR)/pgxn/neon_utils/Makefile install
+	+@echo "Compiling neon_walredo $*"
+	mkdir -p $(POSTGRES_INSTALL_DIR)/build/neon-walredo-$*
+	$(MAKE) PG_CONFIG=$(POSTGRES_INSTALL_DIR)/$*/bin/pg_config CFLAGS='$(PG_CFLAGS) $(COPT)' \
+		-C $(POSTGRES_INSTALL_DIR)/build/neon-walredo-$* \
+		-f $(ROOT_PROJECT_DIR)/pgxn/neon_walredo/Makefile install
+	+@echo "Compiling neon_rmgr $*"
+	mkdir -p $(POSTGRES_INSTALL_DIR)/build/neon-rmgr-$*
+	$(MAKE) PG_CONFIG=$(POSTGRES_INSTALL_DIR)/$*/bin/pg_config CFLAGS='$(PG_CFLAGS) $(COPT)' \
+		-C $(POSTGRES_INSTALL_DIR)/build/neon-rmgr-$* \
+		-f $(ROOT_PROJECT_DIR)/pgxn/neon_rmgr/Makefile install
+	+@echo "Compiling neon_test_utils $*"
+	mkdir -p $(POSTGRES_INSTALL_DIR)/build/neon-test-utils-$*
+	$(MAKE) PG_CONFIG=$(POSTGRES_INSTALL_DIR)/$*/bin/pg_config CFLAGS='$(PG_CFLAGS) $(COPT)' \
+		-C $(POSTGRES_INSTALL_DIR)/build/neon-test-utils-$* \
+		-f $(ROOT_PROJECT_DIR)/pgxn/neon_test_utils/Makefile install
+	+@echo "Compiling neon_utils $*"
+	mkdir -p $(POSTGRES_INSTALL_DIR)/build/neon-utils-$*
+	$(MAKE) PG_CONFIG=$(POSTGRES_INSTALL_DIR)/$*/bin/pg_config CFLAGS='$(PG_CFLAGS) $(COPT)' \
+		-C $(POSTGRES_INSTALL_DIR)/build/neon-utils-$* \
+		-f $(ROOT_PROJECT_DIR)/pgxn/neon_utils/Makefile install
 
 .PHONY: neon-pg-ext-clean-%
 neon-pg-ext-clean-%: