summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2006-08-21 02:54:05 +0000
committerKevin P. Fleming <kpfleming@digium.com>2006-08-21 02:54:05 +0000
commitb1288df748cc9f3b84e0c3d38651b4a5d3998887 (patch)
tree9809e5db37f4e1674677b5f1c03f51286975a5b6
parent94302c792a1563e002fee51a3c66fc9adf9da133 (diff)
document Makefile target changes
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40728 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--Makefile3
-rw-r--r--UPGRADE.txt10
2 files changed, 11 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index a1480d0f2..11d157af8 100644
--- a/Makefile
+++ b/Makefile
@@ -197,8 +197,7 @@ ASTCFLAGS+=$(MALLOC_DEBUG)$(BUSYDETECT)$(OPTIONS)
MOD_SUBDIRS:=res channels pbx apps codecs formats cdr funcs main
OTHER_SUBDIRS:=utils agi
-# Note: OTHER_SUBDIRS must be after MOD_SUBDIRS, because 'utils' uses files from 'main'
-SUBDIRS:=$(MOD_SUBDIRS) $(OTHER_SUBDIRS)
+SUBDIRS:=$(OTHER_SUBDIRS) $(MOD_SUBDIRS)
SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)
SUBDIRS_CLEAN:=$(SUBDIRS:%=%-clean)
SUBDIRS_CLEAN_DEPEND:=$(SUBDIRS:%=%-clean-depend)
diff --git a/UPGRADE.txt b/UPGRADE.txt
index 09ba006ea..bfe6f1711 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -43,6 +43,16 @@ If you would like to save your choices and have them applied against all
builds, the file can be copied to '~/.asterisk.makeopts' or
'/etc/asterisk.makeopts'.
+Build Process (Makefile targets):
+
+The 'valgrind' and 'dont-optimize' targets have been removed; their functionality
+is available by enabling the DONT_OPTIMIZE setting in the 'Compiler Flags' menu
+in the menuselect tool.
+
+It is now possible to run most make targets against a single subdirectory; from
+the top level directory, for example, 'make channels' will run 'make all' in the
+'channels' subdirectory. This also is true for 'clean', 'distclean' and 'depend'.
+
Sound (prompt) and Music On Hold files:
Beginning with Asterisk 1.4, the sound files and music on hold files supplied for