[asterisk-commits] gtjoseph: branch 12 r415318 - /branches/12/utils/Makefile

[SVN commits to the Asterisk project]

Author: gtjoseph
Date: Fri Jun  6 09:08:38 2014
New Revision: 415318

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=415318
Log:
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/

Modified:
    branches/12/utils/Makefile

Modified: branches/12/utils/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/12/utils/Makefile?view=diff&rev=415318&r1=415317&r2=415318
==============================================================================
--- branches/12/utils/Makefile (original)
+++ branches/12/utils/Makefile Fri Jun  6 09:08:38 2014
@@ -88,7 +88,8 @@
 	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 @@
 	$(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 @@
 	$(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