CONTRIB: move halog to admin/
halog is an admin tool, so let's move it to admin/ as well. The makefile
was updated to build from the new directory.
diff --git a/.github/workflows/contrib.yml b/.github/workflows/contrib.yml
index d84c99d..53f6025 100644
--- a/.github/workflows/contrib.yml
+++ b/.github/workflows/contrib.yml
@@ -10,9 +10,9 @@
steps:
- uses: actions/checkout@v2
- - name: Compile contrib/halog/halog
+ - name: Compile admin/halog/halog
run: |
- make contrib/halog/halog
+ make admin/halog/halog
- name: Compile dev/flags/flags
run: |
make dev/flags/flags
diff --git a/.gitignore b/.gitignore
index 0e2f78a..236d125 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@
!/VERDATE
!/VERSION
!/contrib
+!/admin
!/dev
!/doc
!/ebtree
@@ -38,10 +39,10 @@
*.orig
*.bak
# And reject some specific files
-/contrib/halog/halog
-/contrib/ip6range/ip6range
-/contrib/iprange/iprange
-/contrib/systemd/haproxy.service
+/admin/halog/halog
+/admin/iprange/ip6range
+/admin/iprange/iprange
+/admin/systemd/haproxy.service
/contrib/spoa_example/spoa
dev/base64/base64rev-gen
dev/flags/flags
diff --git a/Makefile b/Makefile
index 53cfc9d..29d75fe 100644
--- a/Makefile
+++ b/Makefile
@@ -926,8 +926,8 @@
%.o: %.c $(DEP)
$(cmd_CC) $(COPTS) -c -o $@ $<
-contrib/halog/halog:
- $(Q)$(MAKE) -C contrib/halog halog CC='$(cmd_CC)' OPTIMIZE='$(COPTS)'
+admin/halog/halog:
+ $(Q)$(MAKE) -C admin/halog halog CC='$(cmd_CC)' OPTIMIZE='$(COPTS)'
dev/flags/flags: dev/flags/flags.o
$(cmd_LD) $(LDFLAGS) -o $@ $^ $(LDOPTS)
@@ -998,8 +998,8 @@
$(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 {admin,dev,contrib}/*/*.[oas] {admin,dev,contrib}/*/*/*.[oas] {admin,dev,contrib}/*/*/*/*.[oas]
- $(Q)rm -f admin/iprange/iprange admin/iprange/ip6range
- $(Q)rm -f contrib/halog/halog dev/flags/flags dev/poll/poll dev/tcploop/tcploop
+ $(Q)rm -f admin/iprange/iprange admin/iprange/ip6range admin/halog/halog
+ $(Q)rm -f dev/flags/flags dev/poll/poll dev/tcploop/tcploop
$(Q)rm -f dev/hpack/decode dev/hpack/gen-enc dev/hpack/gen-rht
tags:
diff --git a/contrib/halog/Makefile b/admin/halog/Makefile
similarity index 100%
rename from contrib/halog/Makefile
rename to admin/halog/Makefile
diff --git a/contrib/halog/fgets2.c b/admin/halog/fgets2.c
similarity index 100%
rename from contrib/halog/fgets2.c
rename to admin/halog/fgets2.c
diff --git a/contrib/halog/halog.c b/admin/halog/halog.c
similarity index 100%
rename from contrib/halog/halog.c
rename to admin/halog/halog.c