[asterisk-commits] mjordan: branch 11 r387422 - in /branches/11: ./ utils/Makefile
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu May 2 12:15:06 CDT 2013
Author: mjordan
Date: Thu May 2 12:15:04 2013
New Revision: 387422
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=387422
Log:
Update utils Makefile to handle r387294
Alec's patch that added the Asterisk version to 'core show locks' angered the
items in utils, as they exist somewhat outside of the Asterisk build system.
Some day, this Makefile should get nuked from high orbit, but for now, include
version.c in its list of stuff to pile in.
........
Merged revisions 387421 from http://svn.asterisk.org/svn/asterisk/branches/1.8
Modified:
branches/11/ (props changed)
branches/11/utils/Makefile
Propchange: branches/11/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.
Modified: branches/11/utils/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/11/utils/Makefile?view=diff&rev=387422&r1=387421&r2=387422
==============================================================================
--- branches/11/utils/Makefile (original)
+++ branches/11/utils/Makefile Thu May 2 12:15:04 2013
@@ -151,6 +151,10 @@
aelparse: LIBS+=-lm
aelparse: aelparse.o aelbison.o pbx_ael.o hashtab.o lock.o ael_main.o ast_expr2f.o ast_expr2.o strcompat.o pval.o extconf.o
+version.c: $(ASTTOPDIR)/main/version.c
+ $(ECHO_PREFIX) echo " [CP] $(subst $(ASTTOPDIR)/,,$<) -> $@"
+ $(CMD_PREFIX) cp "$<" "$@"
+
astobj2.c: $(ASTTOPDIR)/main/astobj2.c
$(ECHO_PREFIX) echo " [CP] $(subst $(ASTTOPDIR)/,,$<) -> $@"
$(CMD_PREFIX) cp "$<" "$@"
@@ -176,7 +180,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
+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
refcounter.o: _ASTCFLAGS+=-O0
extconf.o: extconf.c
More information about the asterisk-commits
mailing list