From 2e75cf93aa87ee130c4cd6688b3ef921d5191f23 Mon Sep 17 00:00:00 2001
From: George Joseph <george.joseph@fairview5.com>
Date: Fri, 6 Jun 2014 14:08:38 +0000
Subject: [PATCH] Update utils/Makefile so refcounter compiles post astobj2
 split.

utils/refcounter was removed from trunk so this is a 12-only patch
to keep refcounter from failing to build.

https://reviewboard.asterisk.org/r/3576/


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@415318 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 utils/Makefile | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/utils/Makefile b/utils/Makefile
index 11905fb5cb..3ac5282ba0 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -88,7 +88,8 @@ clean:
 	rm -f *.s *.i
 	rm -f md5.c strcompat.c ast_expr2.c ast_expr2.h ast_expr2f.c pbx_ael.c pval.c hashtab.c lock.c
 	rm -f aelparse.c aelbison.c conf2ael
-	rm -f utils.c strings.c threadstorage.c sha1.c astobj2.c refcounter
+	rm -f astobj2.c astobj2_private.h astobj2_container_private.h astobj2_container.c astobj2_hash.c astobj2_rbtree.c
+	rm -f utils.c strings.c threadstorage.c sha1.c refcounter
 	rm -f db1-ast/.*.d
 	@$(MAKE) -C db1-ast clean
 
@@ -155,7 +156,27 @@ version.c: $(ASTTOPDIR)/main/version.c
 	$(ECHO_PREFIX) echo "   [CP] $(subst $(ASTTOPDIR)/,,$<) -> $@"
 	$(CMD_PREFIX) cp "$<" "$@"
 
-astobj2.c: $(ASTTOPDIR)/main/astobj2.c
+astobj2.c: $(ASTTOPDIR)/main/astobj2.c astobj2_private.h astobj2_container_private.h 
+	$(ECHO_PREFIX) echo "   [CP] $(subst $(ASTTOPDIR)/,,$<) -> $@"
+	$(CMD_PREFIX) cp "$<" "$@"
+
+astobj2_container_private.h: $(ASTTOPDIR)/main/astobj2_container_private.h
+	$(ECHO_PREFIX) echo "   [CP] $(subst $(ASTTOPDIR)/,,$<) -> $@"
+	$(CMD_PREFIX) cp "$<" "$@"
+
+astobj2_private.h: $(ASTTOPDIR)/main/astobj2_private.h
+	$(ECHO_PREFIX) echo "   [CP] $(subst $(ASTTOPDIR)/,,$<) -> $@"
+	$(CMD_PREFIX) cp "$<" "$@"
+
+astobj2_hash.c: $(ASTTOPDIR)/main/astobj2_hash.c astobj2_private.h astobj2_container_private.h
+	$(ECHO_PREFIX) echo "   [CP] $(subst $(ASTTOPDIR)/,,$<) -> $@"
+	$(CMD_PREFIX) cp "$<" "$@"
+
+astobj2_rbtree.c: $(ASTTOPDIR)/main/astobj2_rbtree.c astobj2_private.h astobj2_container_private.h
+	$(ECHO_PREFIX) echo "   [CP] $(subst $(ASTTOPDIR)/,,$<) -> $@"
+	$(CMD_PREFIX) cp "$<" "$@"
+
+astobj2_container.c: $(ASTTOPDIR)/main/astobj2_container.c astobj2_private.h astobj2_container_private.h
 	$(ECHO_PREFIX) echo "   [CP] $(subst $(ASTTOPDIR)/,,$<) -> $@"
 	$(CMD_PREFIX) cp "$<" "$@"
 
@@ -180,8 +201,7 @@ threadstorage.c: $(ASTTOPDIR)/main/threadstorage.c
 	$(CMD_PREFIX) cp "$<" "$@"
 
 
-refcounter: refcounter.o md5.o hashtab.o lock.o utils.o strings.o sha1.o strcompat.o threadstorage.o clicompat.o poll.o version.o astobj2.o
-refcounter.o: _ASTCFLAGS+=-O0
+refcounter: refcounter.o md5.o hashtab.o lock.o utils.o strings.o sha1.o strcompat.o threadstorage.o clicompat.o poll.o version.o astobj2.o astobj2_container.o astobj2_hash.o astobj2_rbtree.o
 
 extconf.o: extconf.c
 
-- 
2.47.2