mirror of
http://git.haproxy.org/git/haproxy.git/
synced 2024-12-22 04:10:48 +00:00
BUILD: makefile: integrate the hpack tools
The few hpack development tools are now integrated into the main makefile, which allows to remove the original one which was causing lots of build warnings. A README was added to explain how to build instead.
This commit is contained in:
parent
339eb0b002
commit
21ef8b9064
2
.github/workflows/contrib.yml
vendored
2
.github/workflows/contrib.yml
vendored
@ -21,4 +21,4 @@ jobs:
|
|||||||
make dev/poll/poll
|
make dev/poll/poll
|
||||||
- name: Compile dev/hpack
|
- name: Compile dev/hpack
|
||||||
run: |
|
run: |
|
||||||
make -C dev/hpack
|
make dev/hpack/decode dev/hpack/gen-enc dev/hpack/gen-rht
|
||||||
|
4
Makefile
4
Makefile
@ -932,6 +932,9 @@ contrib/halog/halog:
|
|||||||
dev/flags/flags: dev/flags/flags.o
|
dev/flags/flags: dev/flags/flags.o
|
||||||
$(cmd_LD) $(LDFLAGS) -o $@ $^ $(LDOPTS)
|
$(cmd_LD) $(LDFLAGS) -o $@ $^ $(LDOPTS)
|
||||||
|
|
||||||
|
dev/hpack/%: dev/hpack/%.o
|
||||||
|
$(cmd_LD) $(LDFLAGS) -o $@ $^ $(LDOPTS)
|
||||||
|
|
||||||
dev/poll/poll:
|
dev/poll/poll:
|
||||||
$(Q)$(MAKE) -C dev/poll poll CC='$(cmd_CC)' OPTIMIZE='$(COPTS)'
|
$(Q)$(MAKE) -C dev/poll poll CC='$(cmd_CC)' OPTIMIZE='$(COPTS)'
|
||||||
|
|
||||||
@ -996,6 +999,7 @@ clean:
|
|||||||
$(Q)rm -f haproxy-$(VERSION) haproxy-$(VERSION)$(SUBVERS)$(EXTRAVERSION) nohup.out gmon.out
|
$(Q)rm -f haproxy-$(VERSION) haproxy-$(VERSION)$(SUBVERS)$(EXTRAVERSION) nohup.out gmon.out
|
||||||
$(Q)rm -f {dev,contrib}/*/*.[oas] {dev,contrib}/*/*/*.[oas] {dev,contrib}/*/*/*/*.[oas]
|
$(Q)rm -f {dev,contrib}/*/*.[oas] {dev,contrib}/*/*/*.[oas] {dev,contrib}/*/*/*/*.[oas]
|
||||||
$(Q)rm -f contrib/halog/halog dev/flags/flags dev/poll/poll dev/tcploop/tcploop
|
$(Q)rm -f contrib/halog/halog dev/flags/flags dev/poll/poll dev/tcploop/tcploop
|
||||||
|
$(Q)rm -f dev/hpack/decode dev/hpack/gen-enc dev/hpack/gen-rht
|
||||||
|
|
||||||
tags:
|
tags:
|
||||||
$(Q)find src include \( -name '*.c' -o -name '*.h' \) -print0 | \
|
$(Q)find src include \( -name '*.c' -o -name '*.h' \) -print0 | \
|
||||||
|
@ -1,9 +0,0 @@
|
|||||||
CFLAGS = -O2 -Wall -g -I../../include -fwrapv -fno-strict-aliasing
|
|
||||||
OBJS = gen-rht gen-enc decode
|
|
||||||
|
|
||||||
all: $(OBJS)
|
|
||||||
|
|
||||||
%: %.c
|
|
||||||
|
|
||||||
clean:
|
|
||||||
-rm -vf $(OBJS) *.o *.a *~
|
|
4
dev/hpack/README
Normal file
4
dev/hpack/README
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
This needs to be built from the top makefile, for example :
|
||||||
|
|
||||||
|
make dev/hpack/{decode,gen-enc,gen-rht}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user