[asterisk-commits] rizzo: trunk r92083 - /trunk/Makefile

[SVN commits to the Asterisk project]

Author: rizzo
Date: Sun Dec  9 22:18:07 2007
New Revision: 92083

URL: http://svn.digium.com/view/asterisk?view=rev&rev=92083
Log:
Fix the detection of modules installed from this build.

You can now add the path of local module subdirs from the command line with
   make LOCAL_MOD_SUBDIRS= ....



Modified:
    trunk/Makefile

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?view=diff&rev=92083&r1=92082&r2=92083
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Sun Dec  9 22:18:07 2007
@@ -24,6 +24,9 @@
 # environment when running make, as follows:
 #
 # $ ASTCFLAGS="-Werror" make
+
+# You can add the path of local module subdirs from the command line with
+#   make LOCAL_MOD_SUBDIRS= ....
 
 export ASTTOPDIR		# Top level dir, used in subdirs' Makefiles
 export ASTERISKVERSION
@@ -266,7 +269,7 @@
 #	#ifdef BUSYDETECT in main/dsp.c
 ASTCFLAGS+=$(MALLOC_DEBUG)$(BUSYDETECT)$(OPTIONS)
 
-MOD_SUBDIRS:=channels pbx apps codecs formats cdr funcs main res
+MOD_SUBDIRS:=channels pbx apps codecs formats cdr funcs main res $(LOCAL_MOD_SUBDIRS)
 OTHER_SUBDIRS:=utils agi
 SUBDIRS:=$(OTHER_SUBDIRS) $(MOD_SUBDIRS)
 SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)
@@ -506,7 +509,7 @@
 $(SUBDIRS_INSTALL):
 	@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(MAKE) --quiet $(PRINT_DIR) -C $(@:-install=) install
 
-NEWMODS=$(notdir $(wildcard */*.so))
+NEWMODS:=$(foreach d,$(MOD_SUBDIRS),$(notdir $(wildcard $(d)/*.so)))
 OLDMODS=$(filter-out $(NEWMODS),$(notdir $(wildcard $(DESTDIR)$(MODULES_DIR)/*.so)))
 
 oldmodcheck: