Skip to content

Commit

Permalink
CONTRIB: debug: split poll from flags
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
wtarreau committed Apr 2, 2021
1 parent 6a54d74 commit 34b4369
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/contrib.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 | \
Expand Down
5 changes: 1 addition & 4 deletions contrib/debug/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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] *~
11 changes: 11 additions & 0 deletions contrib/poll/Makefile
Original file line number Diff line number Diff line change
@@ -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] *~
File renamed without changes.

0 comments on commit 34b4369

Please sign in to comment.