[svn-commits] kpfleming: linux/trunk r4506 - in /linux/trunk: ./ drivers/dahdi/

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Wed Jul  2 07:23:37 2008
New Revision: 4506

URL: http://svn.digium.com/view/dahdi?view=rev&rev=4506
Log:
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


Removed:
    linux/trunk/Kbuild
Modified:
    linux/trunk/Makefile
    linux/trunk/drivers/dahdi/Kbuild

Modified: linux/trunk/Makefile
URL: http://svn.digium.com/view/dahdi/linux/trunk/Makefile?view=diff&rev=4506&r1=4505&r2=4506
==============================================================================
--- linux/trunk/Makefile (original)
+++ linux/trunk/Makefile Wed Jul  2 07:23:37 2008
@@ -4,20 +4,6 @@
 # Copyright (C) 2001-2008 Digium, Inc.
 #
 #
-
-# 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)
 
@@ -69,7 +55,7 @@
 
 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 @@
   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 @@
 	$(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 @@
 	@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
 
-endif # ifdef KBUILD_EXTMOD
+test:
+	./test-script $(DESTDIR)/lib/modules/$(KVERS) dahdi
+
+.PHONY: distclean dist-clean clean version.h all install devices modules stackcheck install-udev update install-modules install-include uninstall-modules firmware-download

Modified: linux/trunk/drivers/dahdi/Kbuild
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/Kbuild?view=diff&rev=4506&r1=4505&r2=4506
==============================================================================
--- linux/trunk/drivers/dahdi/Kbuild (original)
+++ linux/trunk/drivers/dahdi/Kbuild Wed Jul  2 07:23:37 2008
@@ -26,7 +26,7 @@
 obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECHOCAN_KB1)	+= dahdi_echocan_kb1.o
 obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECHOCAN_MG2)	+= dahdi_echocan_mg2.o
 
-CFLAGS_MODULE += -I$(src)
+CFLAGS_MODULE += -I$(DAHDI_INCLUDE) -I$(src)
 
 ifndef HOTPLUG_FIRMWARE
 ifneq (,$(filter y m,$(CONFIG_FW_LOADER)))