From 2a3a239f8062c650728f1d1b7e0572fcaa9db6dc Mon Sep 17 00:00:00 2001
From: proski <proski>
Date: Wed, 2 Aug 2006 02:50:35 +0000
Subject: Join modules into one, call it at76_usb

Install it in kernel/drivers/net/wireless - no need to have a
subdirectory for just one module.  "make install" removes the old
modules first.  Simplify "make uninstall".

Remove module stuff from at76_usbdfu.c.  Reuse common debug facility,
use DBG_DFU for DFU related debug.
---
 Makefile | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 7afc0d6..a3bb898 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,9 @@ KERNELRELEASE = $(shell sed -ne 's/"//g;s/^\#define UTS_RELEASE //p' \
 		  $(VERSION_HEADER))
 
 
-obj-m = at76c503.o at76_usbdfu.o
+obj-m = at76_usb.o
+
+at76_usb-objs = at76c503.o at76_usbdfu.o
 
 SRCS = at76c503.c at76_usbdfu.c
 
@@ -47,7 +49,7 @@ DISTNAME = at76c503-$(VERSION)
 DISTDIR = $(DISTNAME)
 endif
 
-INSTALL_MOD_DIR = kernel/drivers/net/wireless/at76c503
+INSTALL_MOD_DIR = kernel/drivers/net/wireless
 MODULE_DIR = $(DESTDIR)/lib/modules/$(KERNELRELEASE)/$(INSTALL_MOD_DIR)
 DEPMOD = /sbin/depmod
 
@@ -68,14 +70,13 @@ check:
 	$(MAKE) $(KBUILD_FLAGS) C=2 CF="$(SPARSE_FLAGS)"
 
 install:
+	rm -rf $(MODULE_DIR)/at76*
 	$(MAKE) $(KBUILD_FLAGS) modules_install \
 		INSTALL_MOD_DIR="$(INSTALL_MOD_DIR)"
 	$(DEPMOD) -ae
 
 uninstall:
-	for f in $(obj-m:%.o=%.ko); do rm -f $(MODULE_DIR)/$$f; done
-
-.PHONY: all dist kernel_patch rmmod install modules
+	rm -rf $(MODULE_DIR)/at76*
 
 TAGS:
 	rm -f TAGS
@@ -97,7 +98,9 @@ dist:
 	tar zcvf $(DISTNAME).tar.gz $(DISTNAME)
 
 kernel_patch:
-	 DRV_SRC="$(SRCS)" DRV_HDR="$(HDRS)" ./kernel_patch.sh $(KERNEL_PATH)
+	DRV_SRC="$(SRCS)" DRV_HDR="$(HDRS)" ./kernel_patch.sh $(KERNEL_PATH)
 
 rmmod:
 	-rmmod $(obj-m:%.o=%)	
+
+.PHONY: all modules check install uninstall clean dist kernel_patch rmmod
-- 
cgit v1.2.3