[zaptel-commits] tzafrir: branch 1.2 r2878 - in /branches/1.2: Makefile README

[SVN commits to the Zaptel project]

Author: tzafrir
Date: Fri Aug 17 11:16:23 2007
New Revision: 2878

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2878
Log:
Fix building extra modules in subdirectories.

Modified:
    branches/1.2/Makefile
    branches/1.2/README

Modified: branches/1.2/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.2/Makefile?view=diff&rev=2878&r1=2877&r2=2878
==============================================================================
--- branches/1.2/Makefile (original)
+++ branches/1.2/Makefile Fri Aug 17 11:16:23 2007
@@ -64,7 +64,7 @@
 
 # for building extra modules in this directory without editing the
 # Makefiles:
-# running:  make MODULES_EXTRA=mod1 mod2 subdir1/ subdir2/"
+# running:  make MODULES_EXTRA="mod1 mod2" SUBDIRS_EXTRA="subdir1/ subdir2/"
 # "subdir/" only works with kernel 2.6.
 MODULES+=$(MODULES_EXTRA)
 
@@ -72,6 +72,10 @@
 
 MODULESO:=$(MODULES:%=%.o)
 MODULESKO:=$(MODULES:%=%.ko)
+
+ifeq ($(BUILDVER),linux26)
+MODULESO+=$(SUBDIRS_EXTRA:%=%/)
+endif
 
 # add this later, so it doesn't become part of MODULESO/MODULESKO
 MODULES+=wct4xxp wctc4xxp wctdm24xxp

Modified: branches/1.2/README
URL: http://svn.digium.com/view/zaptel/branches/1.2/README?view=diff&rev=2878&r1=2877&r2=2878
==============================================================================
--- branches/1.2/README (original)
+++ branches/1.2/README Fri Aug 17 11:16:23 2007
@@ -175,14 +175,14 @@
 distribution, use the optional variables MODULES_EXTRA and
 SUBDIRS_EXTRA:
 
-  make MODULES_EXTRA="mod1 mod2 subdir1/ subdir2/"
+  make MODULES_EXTRA="mod1 mod2"
+  make MODULES_EXTRA="mod1 mod2" SUBDIRS_EXTRA="subdir1/ subdir1/"
 
 Note that those names are not guaranteed to continue to work on newer
-versions (in fact, it is slightly different on 1.4). Hopefully there will 
-be no need for such extra configuration.
+versions. Hopefully there will be no need for such extra configuration.
 
 Partial Build/Install
-^^^^^^^^^^^^^^^~~~~~~
+^^^^^^^^^^^^^^^^^^^^^
 There are some make targets that are provided to build or install just
 parts of Zaptel: