diff options
author | Kevin P. Fleming <kpfleming@digium.com> | 2008-07-02 12:23:37 +0000 |
---|---|---|
committer | Kevin P. Fleming <kpfleming@digium.com> | 2008-07-02 12:23:37 +0000 |
commit | 401f639f140c6030513bd129c5108af2f97967de (patch) | |
tree | 998b982c9aa6fe9f1c5a3c517eb38e004d655da9 /Makefile | |
parent | 331a32f40381f695a1df9a5e56a324fc7089f063 (diff) |
there is no need for the top-level Makefile to be involved in the kernel's build process, and removing it gets the modules installed into the proper directories in /lib/modules
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@4506 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 30 |
1 files changed, 10 insertions, 20 deletions
@@ -5,20 +5,6 @@ # # -# This Makefile is used both by the kernel build system (to set -# a number of variables before descending into the real module -# build directory) and by the top-level 'make' process. We can -# determine which mode is needed by checking the KBUILD_EXTMOD -# variable, although on reasonably new kernels the kernel build -# system won't even use this file, it will just use the Kbuild -# file directly. - -ifdef KBUILD_EXTMOD - -include $(src)/Kbuild - -else - PWD:=$(shell pwd) ifndef ARCH @@ -69,7 +55,7 @@ endif MODULE_ALIASES=wcfxs wctdm8xxp wct2xxp -KMAKE = $(MAKE) -C $(KSRC) ARCH=$(ARCH) SUBDIRS=$(PWD) DAHDI_INCLUDE=$(PWD)/include HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE) +KMAKE=$(MAKE) -C $(KSRC) ARCH=$(ARCH) SUBDIRS=$(PWD)/drivers/dahdi DAHDI_INCLUDE=$(PWD)/include HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE) ifneq (,$(wildcard $(DESTDIR)/etc/udev/rules.d)) DYNFS=yes @@ -81,7 +67,7 @@ ifneq ($(wildcard .version),) DAHDIVERSION:=$(shell cat .version) else ifneq ($(wildcard .svn),) - DAHDIVERSION=$(shell build_tools/make_version . dahdi/linux) + DAHDIVERSION:=$(shell build_tools/make_version . dahdi/linux) endif endif @@ -167,9 +153,9 @@ uninstall-hotplug: $(MAKE) -C drivers/dahdi/firmware hotplug-uninstall DESTDIR=$(DESTDIR) uninstall-modules: - @./build_tools/uninstall-modules $(DESTDIR)/lib/modules/$(KVERS) $(ALL_MODULES) + @build_tools/uninstall-modules $(DESTDIR)/lib/modules/$(KVERS) -install-modules: modules +install-modules: modules #uninstall-modules $(KMAKE) INSTALL_MOD_PATH=$(DESTDIR) INSTALL_MOD_DIR=dahdi modules_install [ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || : @@ -197,6 +183,10 @@ dist-clean: clean @rm -f include/dahdi/version.h @$(MAKE) -C drivers/dahdi/firmware dist-clean -.PHONY: distclean dist-clean clean version.h all install devices modules stackcheck install-udev update install-modules install-include uninstall-modules +firmware-download: + @$(MAKE) -C drivers/dahdi/firmware all + +test: + ./test-script $(DESTDIR)/lib/modules/$(KVERS) dahdi -endif # ifdef KBUILD_EXTMOD +.PHONY: distclean dist-clean clean version.h all install devices modules stackcheck install-udev update install-modules install-include uninstall-modules firmware-download |