[zaptel-commits] tzafrir: branch 1.4 r2958 - /branches/1.4/Makefile

[SVN commits to the Zaptel project]

Author: tzafrir
Date: Mon Aug 27 01:31:20 2007
New Revision: 2958

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2958
Log:
* Skip cleaning modules if KSRC is not defined: it is optional if you 
  build userspace alone ("make programs").
* Pass HOTPLUG_FIRMWARE explicitly to kernel 2.6 makefile. This is to 
  help eventually remove .EXPORT_ALL_VARIABLES from Makefile.

Modified:
    branches/1.4/Makefile

Modified: branches/1.4/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.4/Makefile?view=diff&rev=2958&r1=2957&r2=2958
==============================================================================
--- branches/1.4/Makefile (original)
+++ branches/1.4/Makefile Mon Aug 27 01:31:20 2007
@@ -174,7 +174,7 @@
 
 KFLAGS+=-DSTANDALONE_ZAPATA
 CFLAGS+=-DSTANDALONE_ZAPATA
-KMAKE  = $(MAKE) -C $(KSRC) SUBDIRS=$(PWD)
+KMAKE  = $(MAKE) -C $(KSRC) SUBDIRS=$(PWD) HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE)
 KMAKE_INST = $(KMAKE) \
   INSTALL_MOD_PATH=$(DESTDIR) INSTALL_MOD_DIR=misc modules_install
 
@@ -272,7 +272,7 @@
 modules: prereq
 	@if [ -z "$(KSRC)" -o ! -d "$(KSRC)" ]; then echo "You do not appear to have the sources for the $(KVERS) kernel installed."; exit 1 ; fi
 ifeq ($(BUILDVER),linux26)
-	$(MAKE) -C $(KSRC) SUBDIRS=$(PWD) modules
+	$(KMAKE) modules
 else
 modules: $(INSTALL_MODULES)
 endif
@@ -602,7 +602,9 @@
 	rm -f *.o ztcfg tzdriver sethdlc sethdlc-new
 	rm -f $(LTZ_SO) $(LTZ_A) *.lo
 ifeq ($(BUILDVER),linux26)
-	$(MAKE) -C $(KSRC) SUBDIRS=$(PWD) clean || :
+  ifneq (,$(KSRC))
+	$(KMAKE) clean
+  endif
 	$(MAKE) -C xpp/utils clean
 else
 	$(MAKE) -C wct4xxp clean