summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authortzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2007-08-27 06:31:20 +0000
committertzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2007-08-27 06:31:20 +0000
commitfec17d8287ae585bfc4a2f7338ee3e3cc677815b (patch)
tree75d8928daea4415bf13ab6a90446584a4ebca4dc /Makefile
parent51eea8090485bc2103942db4e2dc65d2c9a825a9 (diff)
* 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. git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@2958 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 6d26634..4fc86be 100644
--- a/Makefile
+++ b/Makefile
@@ -174,7 +174,7 @@ MODULE_ALIASES=wcfxs wctdm8xxp wct2xxp
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 @@ utils: $(BINS) xpp-utils
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 @@ clean:
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