From a1bef636de657ff245660b6161458dcfe24c7a61 Mon Sep 17 00:00:00 2001
From: Hamish Coleman <hamish@zot.org>
Date: Sun, 25 Jun 2023 09:34:27 +0100
Subject: [PATCH] Partially Revert "Add rules to run autogen/configure and use
 them in some of the simpler CI builds"

This reverts commit 87c20d750e38e43584bdfcae94d859c453dce4e1.
---
 .github/workflows/tests.yml | 22 +++++++++++++++++-----
 Makefile                    |  6 +-----
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 31bc28f..769b8b9 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -21,6 +21,8 @@ jobs:
 
       - name: Run minimal test set
         run: |
+          ./autogen.sh
+          ./configure
           make test
 
       - if: ${{ failure() }}
@@ -53,7 +55,7 @@ jobs:
 
       - name: Run minimal test set
         run: |
-          make configure
+          ./autogen.sh
           ./configure \
             --enable-pthread \
             --enable-miniupnp \
@@ -76,6 +78,12 @@ jobs:
         run: |
           git fetch --force --tags
 
+
+      - name: Make the makefiles
+        run: |
+          ./autogen.sh
+          ./configure
+
       - name: Install essential
         run: |
           sudo apt update
@@ -110,7 +118,7 @@ jobs:
 
       - name: Make the makefiles
         run: |
-          make configure
+          ./autogen.sh
 
           export CFLAGS="${{ matrix.flags }}"
           export LDFLAGS="${{ matrix.flags }}"
@@ -156,8 +164,10 @@ jobs:
           sudo apt-get update
           sudo apt-get install build-essential
 
-      - name: Install required packages
+      - name: generate a makefile and use it to install more packages
         run: |
+          ./autogen.sh
+          ./configure
           make build-dep
         shell: bash
 
@@ -220,12 +230,14 @@ jobs:
           git fetch --force --tags
 
 
-      - name: Install essential
+      - name: Install packages
         run: |
           brew install automake
 
-      - name: Install required packages
+      - name: generate a makefile and use it to install more packages
         run: |
+          ./autogen.sh
+          ./configure
           make build-dep
         shell: bash
 
diff --git a/Makefile b/Makefile
index f4ea5dc..60b5b5d 100644
--- a/Makefile
+++ b/Makefile
@@ -193,6 +193,7 @@ COVERAGEDIR?=coverage
 
 .PHONY: $(SUBDIRS)
 
+.PHONY: all
 all: version $(APPS) $(DOCS) $(SUBDIRS)
 
 # This allows breaking the build if the version.sh script discovers
@@ -321,11 +322,6 @@ install: edge supernode edge.8.gz supernode.1.gz n2n.7.gz
 	$(INSTALL_DOC) n2n.7.gz $(MAN7DIR)/
 	$(MAKE) -C tools install SBINDIR=$(abspath $(SBINDIR))
 
-configure include/config.h.in: configure.ac
-	autoreconf -if
-config.mak include/config.h: config.mak.in include/config.h.in configure
-	./configure
-
 # Docker builder section
 DOCKER_IMAGE_NAME=ntop/supernode
 DOCKER_IMAGE_VERSION=$N2N_VERSION_SHORT