diff options
author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-04-30 16:11:50 +0000 |
---|---|---|
committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-04-30 16:11:50 +0000 |
commit | 683c50f84afea2a4d364ce1ac54d04177ca4bb3b (patch) | |
tree | c95db12567fab2ce226d4c8f11cd390af3fcb4d4 /Makefile | |
parent | 66c9b1f76f139ec8694b1f4ce8e9f74619f357cb (diff) |
optimize variable settings
use the kernel Makefile for every step that it can be
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@1015 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 23 |
1 files changed, 13 insertions, 10 deletions
@@ -25,8 +25,8 @@ CFLAGS+=-I. -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER CFLAGS_PPC:=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi) CFLAGS_X86-64:=$(shell if uname -m | grep -q x86_64; then echo "-m64"; fi) CFLAGS+=$(CFLAGS_PPC) $(CFLAGS_X86-64) -LCFLAGS=-fPIC $(CFLAGS) -DBUILDING_TONEZONE -KFLAGS=-I$(KINCLUDES) -O6 +LCFLAGS:=-fPIC $(CFLAGS) -DBUILDING_TONEZONE +KFLAGS:=-I$(KINCLUDES) -O6 KFLAGS+=-DMODULE -D__KERNEL__ -DEXPORT_SYMTAB -I$(KSRC)/drivers/net \ -Wall -I. -Wstrict-prototypes -fomit-frame-pointer -I$(KSRC)/drivers/net/wan -I$(KINCLUDES)/net ifneq (,$(wildcard $(KINCLUDES)/linux/modversions.h)) @@ -42,11 +42,14 @@ KFLAGS+=$(shell if uname -r | grep -q 2.4; then if uname -m | grep -q x86_64; th KFLAGS+=-DSTANDALONE_ZAPATA CFLAGS+=-DSTANDALONE_ZAPATA +KMAKE:= $(MAKE) -C $(KSRC) SUBDIRS=$(PWD) +KMAKE_INST:= $(KMAKE) INSTALL_MOD_PATH=$(INSTALL_PREFIX) INSTALL_MOD_DIR=misc modules_install +EXTRA_CFLAGS:=-I$(src) ROOT_PREFIX= -INSTALL_PREFIX=$(DESTDIR) +INSTALL_PREFIX:=$(DESTDIR) -CONFIG_FILE=$(INSTALL_PREFIX)/etc/zaptel.conf +CONFIG_FILE:=$(INSTALL_PREFIX)/etc/zaptel.conf CFLAGS+=-DZAPTEL_CONFIG=\"$(CONFIG_FILE)\" ifeq (2.6,$(shell echo $(KVERS) | cut -d. -f1-2)) @@ -158,9 +161,9 @@ linux24: prereq $(MODULESO) $(BINS) linux26: prereq $(BINS) @echo $(KSRC) @if [ -z "$(KSRC)" -o ! -d "$(KSRC)" ]; then echo "You do not appear to have the sources for the $(KVERS) kernel installed."; exit 1 ; fi - $(MAKE) -C $(KSRC) SUBDIRS=$(PWD) XPPMOD=$(XPPMOD) modules + $(KMAKE) modules -xpp: linux26 +obj-m += $(MODULESO) #ifneq ($(TOPDIR),) #include $(TOPDIR)/Rules.make @@ -342,7 +345,7 @@ install: all devices for x in $(MODULESKO); do \ rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/extra/$$x ; \ done; \ - $(MAKE) -C $(KSRC) SUBDIRS=$(PWD) INSTALL_MOD_PATH=$(INSTALL_PREFIX) INSTALL_MOD_DIR=misc modules_install; \ + $(KMAKE_INST); \ if ! [ -f wcfxsusb.ko ]; then \ rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/wcfxsusb.ko; \ fi; \ @@ -462,9 +465,9 @@ clean: rm -f ${BINS} rm -f *.o ztcfg tzdriver sethdlc sethdlc-new rm -f $(TZOBJS) $(LIBTONEZONE_SO) *.lo - rm -f *.ko *.mod.c .*o.cmd - rm -f xpp/*.ko xpp/*.mod.c xpp/.*o.cmd - rm -f xpp/*.o xpp/*.mod.o +ifeq (${BUILDVER},linux26) + $(KMAKE) clean +endif rm -rf .tmp_versions rm -f gendigits tones.h rm -f libtonezone* |