From d88b0bb7fe2fdaffc0a4ec707887ac9cc94e47d5 Mon Sep 17 00:00:00 2001
From: Jon Shallow <supjps-libcoap@jpshallow.com>
Date: Tue, 6 Mar 2018 19:27:42 +0000
Subject: [PATCH] Makefile.am: Drop building coap hash functions

As "coap_key_t key" is no longer used as the key for hashing resources onto
the hashlist which gave the potential for coap hashes clashing for the
resource Uri, "str uri" being used instead, so disable the building of the
coap_hash functions.

In addition, the .sym and .map file information now has duplicate
entries removed.
---
 Makefile.am | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 28241f42..c9878016 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -74,7 +74,6 @@ libcoap_@LIBCOAP_API_VERSION@_la_SOURCES = \
   src/coap_tinydtls.c \
   src/debug.c \
   src/encode.c \
-  src/hashkey.c \
   src/mem.c \
   src/net.c \
   src/option.c \
@@ -102,7 +101,6 @@ libcoap_include_HEADERS = \
   $(top_srcdir)/include/coap/coap_time.h \
   $(top_srcdir)/include/coap/debug.h \
   $(top_srcdir)/include/coap/encode.h \
-  $(top_srcdir)/include/coap/hashkey.h \
   $(top_srcdir)/include/coap/libcoap.h \
   $(top_srcdir)/include/coap/mem.h \
   $(top_srcdir)/include/coap/net.h \
@@ -155,14 +153,14 @@ update-map-file: libcoap-$(LIBCOAP_API_VERSION).map libcoap-$(LIBCOAP_API_VERSIO
 libcoap-$(LIBCOAP_API_VERSION).map: check_ctags $(libcoap_include_HEADERS)
 	( echo "VER_$(LIBCOAP_API_VERSION) {" ; \
 	echo "global:" ; \
-	$(CTAGS_PROG) $(CTAGS_IGNORE) -f - --c-kinds=p $(libcoap_include_HEADERS) | awk '/^coap_/ { print "  " $$1 ";" }' | sort ; \
+	$(CTAGS_PROG) $(CTAGS_IGNORE) -f - --c-kinds=p $(libcoap_include_HEADERS) | awk '/^coap_/ { print "  " $$1 ";" }' | sort -u ; \
 	echo "local:" ; \
 	echo "  *;" ; \
 	echo "};" ) > $@.new
 	mv $@.new $@
 
 libcoap-$(LIBCOAP_API_VERSION).sym: check_ctags $(libcoap_include_HEADERS)
-	( $(CTAGS_PROG) $(CTAGS_IGNORE) -f - --c-kinds=p $(libcoap_include_HEADERS) | awk '/^coap_/ { print $$1 }' | sort ) \
+	( $(CTAGS_PROG) $(CTAGS_IGNORE) -f - --c-kinds=p $(libcoap_include_HEADERS) | awk '/^coap_/ { print $$1 }' | sort -u ) \
 	> $@.new
 	mv $@.new $@