REORG: ebtree: clean up remains of the ebtree/ directory
The only leftovers were the unused compiler.h file and the LICENSE file
which is already mentioned in each and every ebtree file header.
A few build paths were updated in the contrib/ directory not to mention
this directory anymore, and all its occurrences were dropped from the
main makefile. From now on no other include path but include/ will be
needed anymore to build any file.
diff --git a/Makefile b/Makefile
index b9bc112..ed73611 100644
--- a/Makefile
+++ b/Makefile
@@ -715,12 +715,9 @@
endif
endif
-# This one can be changed to look for ebtree files in an external directory
-EBTREE_DIR := ebtree
-
#### Global compile options
VERBOSE_CFLAGS = $(CFLAGS) $(TARGET_CFLAGS) $(SMALL_OPTS) $(DEFINE)
-COPTS = -Iinclude -I$(EBTREE_DIR)
+COPTS = -Iinclude
COPTS += $(CFLAGS) $(TARGET_CFLAGS) $(SMALL_OPTS) $(DEFINE) $(SILENT_DEFINE)
COPTS += $(DEBUG) $(OPTIONS_CFLAGS) $(ADDINC)
@@ -827,7 +824,7 @@
endif
# Used only for forced dependency checking. May be cleared during development.
-INCLUDES = $(wildcard include/*/*.h ebtree/*.h)
+INCLUDES = $(wildcard include/*/*.h)
DEP = $(INCLUDES) .build_opts
help:
@@ -919,7 +916,7 @@
clean:
$(Q)rm -f *.[oas] src/*.[oas] haproxy test .build_opts .build_opts.new
- $(Q)for dir in . src include/* doc ebtree; do rm -f $$dir/*~ $$dir/*.rej $$dir/core; done
+ $(Q)for dir in . src include/* doc; do rm -f $$dir/*~ $$dir/*.rej $$dir/core; done
$(Q)rm -f haproxy-$(VERSION).tar.gz haproxy-$(VERSION)$(SUBVERS).tar.gz
$(Q)rm -f haproxy-$(VERSION) haproxy-$(VERSION)$(SUBVERS) nohup.out gmon.out