CONTRIB: debug: split poll from flags

Now poll is its own project and doesn't share the "flags" Makefile
any more. One of the issues was that it was making references to the
haproxy include path which is not needed here.

diff --git a/.github/workflows/contrib.yml b/.github/workflows/contrib.yml
index 39556e123715db21465a4432bcc3cdca30f2099f..4b88938e8a327ba4b7765b78fdb8edc2dfb0a21a 100644 (file)
--- a/.github/workflows/contrib.yml
+++ b/.github/workflows/contrib.yml
@@ -16,9 +16,9 @@ jobs:
     - name: Compile contrib/debug/flags
       run: |
         make contrib/debug/flags
-    - name: Compile contrib/debug/poll
+    - name: Compile contrib/poll/poll
       run: |
-        make contrib/debug/poll
+        make contrib/poll/poll
     - name: Compile contrib/hpack
       run: |
         make -C contrib/hpack

diff --git a/.gitignore b/.gitignore
index f77751a6dbdbcdc113904d32da5da5df5eb45577..fdbc66af9cbc7eec241c2f4500219feecc5f122e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -44,6 +44,7 @@
 /contrib/systemd/haproxy.service
 /contrib/spoa_example/spoa
 contrib/debug/flags
+contrib/poll/poll
 contrib/mod_defender/defender
 contrib/modsecurity/modsecurity
 contrib/hpack/decode

diff --git a/Makefile b/Makefile
index 2ff6cd38bca08ea108a0c3913c59292e8bfbd9ac..fc62b133fa540cdf022c98e01626569804097f1a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -995,7 +995,7 @@ clean:
        $(Q)rm -f haproxy-$(VERSION).tar.gz haproxy-$(VERSION)$(SUBVERS)$(EXTRAVERSION).tar.gz
        $(Q)rm -f haproxy-$(VERSION) haproxy-$(VERSION)$(SUBVERS)$(EXTRAVERSION) nohup.out gmon.out
        $(Q)rm -f contrib/*/*.[oas] contrib/*/*/*.[oas] contrib/*/*/*/*.[oas]
-       $(Q)rm -f contrib/halog/halog contrib/debug/flags contrib/debug/poll contrib/tcploop/tcploop
+       $(Q)rm -f contrib/halog/halog contrib/debug/flags contrib/poll/poll contrib/tcploop/tcploop
 
 tags:
        $(Q)find src include \( -name '*.c' -o -name '*.h' \) -print0 | \

diff --git a/contrib/debug/Makefile b/contrib/debug/Makefile
index 74dd6ac713e86ffd2e84c9745dddafa9f437f574..9171eaf4c4974de4eda9f0dbfaec931ffd183477 100644 (file)
--- a/contrib/debug/Makefile
+++ b/contrib/debug/Makefile
@@ -3,15 +3,12 @@ INCLUDE  = -I../../include
 CC       = gcc
 OPTIMIZE = -O2
 DEFINE   =
-OBJS     = flags poll
+OBJS     = flags
 
 all: $(OBJS)
 
 flags: flags.c
        $(CC) $(OPTIMIZE) $(DEFINE) $(INCLUDE) -o $@ $^
 
-poll: poll.c
-       $(CC) $(OPTIMIZE) $(DEFINE) $(INCLUDE) -o $@ $^
-
 clean:
        rm -f $(OBJS) *.[oas] *~

diff --git a/contrib/poll/Makefile b/contrib/poll/Makefile
new file mode 100644 (file)
index 0000000..fdee514
--- /dev/null
+++ b/contrib/poll/Makefile
@@ -0,0 +1,11 @@
+CC       = cc
+OPTIMIZE = -O2 -g
+DEFINE   =
+INCLUDE  =
+OBJS     = poll
+
+poll: poll.c
+       $(CC) $(OPTIMIZE) $(DEFINE) $(INCLUDE) -o $@ $^
+
+clean:
+       rm -f $(OBJS) *.[oas] *~

diff --git a/contrib/debug/poll.c b/contrib/poll/poll.c
similarity index 100%
rename from contrib/debug/poll.c
rename to contrib/poll/poll.c