From 1a37ee4025569e3eb4bb4106f8212dedfd84469d Mon Sep 17 00:00:00 2001 From: Steve Murphy Date: Wed, 17 Dec 2008 05:04:56 +0000 Subject: A possibly "horrible fix" for a "horribly broken" situation. As stuff shifts around in the asterisk code, the miscellaneous inclusions from the standalone stuff gets broken. There's no easy fix for this situation. I made sure that everything in utils builds without problem ***AND*** that aelparse runs the regressions correctly with the following make menuselect options both on and off: DONT_OPTIMIZE DEBUG_THREADS DEBUG_CHANNEL_LOCKS MALLOC_DEBUG MTX_PROFILE DEBUG_SCHEDULER DEBUG_THREADLOCALS DETECT_DEADLOCKS CHANNEL_TRACE I think from now on, I'm going to #undef all these features in the various utils native files; I guess I could do the same for the copied-in files, surrounded by STANDALONE ifdef. A standalone isn't going to care about threads, mutexes, etc. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@165071 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- utils/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'utils/Makefile') diff --git a/utils/Makefile b/utils/Makefile index a9067802c..03ecdf634 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -16,9 +16,7 @@ ASTTOPDIR?=.. .PHONY: clean all uninstall -ALL_UTILS:=astman smsq stereorize streamplayer muted check_expr hashtest2 hashtest astcanary refcounter -# aelparse and conf2ael currently not being built because they rely on extconf, which is horribly broken -# ALL_UTILS:=aelparse conf2ael +ALL_UTILS:=astman smsq stereorize streamplayer muted check_expr hashtest2 hashtest astcanary refcounter aelparse conf2ael UTILS:=$(ALL_UTILS) LIBS += $(BKTR_LIB) # astobj2 with devmode uses backtrace -- cgit v1.2.3