From 6e09bc194d8ac86e04987edd71791ec8df883d0c Mon Sep 17 00:00:00 2001
From: Andreas Karlsson <andreas.karlsson@percona.com>
Date: Fri, 17 Oct 2025 07:20:47 +0200
Subject: [PATCH] Remove support from non-PGXS builds

The exmaple extnesion in the official documentation requires PGXS and I
do not see any reason for us to have code which tries to support non-PXS
builds.

https://www.postgresql.org/docs/current/extend-pgxs.html
---
 .github/workflows/make-build.yml | 71 --------------------------------
 Makefile                         |  9 ----
 2 files changed, 80 deletions(-)
 delete mode 100644 .github/workflows/make-build.yml

diff --git a/.github/workflows/make-build.yml b/.github/workflows/make-build.yml
deleted file mode 100644
index 28be167..0000000
--- a/.github/workflows/make-build.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-name: Make
-
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-
-jobs:
-  make-build:
-    name: Build
-    runs-on: ubuntu-latest
-    env:
-      CC: clang-21
-      CXX: clang++-21
-      CXXFLAGS: -stdlib=libc++
-      LDFLAGS: -stdlib=libc++
-
-    steps:
-    - name: Install dependencies
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y \
-          build-essential \
-          pkg-config \
-          libjwt-dev \
-          libcurl4-openssl-dev \
-          libssl-dev \
-          libreadline-dev \
-          zlib1g-dev \
-          libxml2-dev \
-          libxslt1-dev \
-          uuid-dev \
-          flex \
-          bison
-        wget https://apt.llvm.org/llvm.sh
-        chmod +x llvm.sh
-        sudo ./llvm.sh 21 all
-        sudo apt-get install libc++-21-dev libc++abi-21-dev
-
-    - name: Checkout PostgreSQL source
-      uses: actions/checkout@v4
-      with:
-        repository: postgres/postgres
-        ref: REL_18_STABLE
-        path: pg-source
-
-    - name: Checkout pg_oidc_validator extension
-      uses: actions/checkout@v4
-      with:
-        path: pg-source/contrib/pg_oidc_validator
-        submodules: true
-
-    - name: Add pg_oidc_validator to contrib Makefile
-      run: |
-        cd pg-source
-        # Add pg_oidc_validator to the SUBDIRS list in contrib/Makefile
-        sed -i '/^SUBDIRS = /s/$/ pg_oidc_validator/' contrib/Makefile
-
-    - name: Configure PostgreSQL
-      run: |
-        cd pg-source
-        ./configure \
-          --prefix=/usr/local/pgsql \
-          --enable-debug \
-          --enable-cassert
-
-    - name: Build PostgreSQL with pg_oidc_validator
-      run: |
-        cd pg-source
-        make -j$(nproc)
-        make -j -C contrib/pg_oidc_validator
diff --git a/Makefile b/Makefile
index 7d36eb3..008bb2a 100644
--- a/Makefile
+++ b/Makefile
@@ -12,18 +12,9 @@ PGFILEDESC = "pg_oidc_validator - OAuth token validation for PostgreSQL"
 
 PG_CPPFLAGS = -Ijwt-cpp/include -std=c++23
 
-USE_PGXS ?= 0
-
-ifeq ($(USE_PGXS), 1)
 PG_CONFIG ?= pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
-else
-subdir = contrib/pg_oidc_validator
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-include $(top_srcdir)/contrib/contrib-global.mk
-endif
 
 override SHLIB_LINK += -lcurl