From bee4bcf890d63a5cbbf02ab0a2ca80bd60df220f Mon Sep 17 00:00:00 2001
From: Alessandro Rubini <rubini@gnudd.com>
Date: Sat, 20 Nov 2010 00:17:42 +0100
Subject: [PATCH] wr_vic: moved to wr_minic dir; simplified make

This unifies wr_vic and wr_minic in a single directory,
which results in a simplification of Makefiles.
EXTRA_CFLAGS has been removed as it's now not needed any more.
---
 Makefile                             |  4 +---
 wr_minic/Makefile                    |  7 +------
 wr_minic/{README => README.minic}    |  0
 wr_vic/README => wr_minic/README.vic |  0
 {wr_vic => wr_minic}/wr_vic.c        |  0
 {wr_vic => wr_minic}/wr_vic.h        |  0
 wr_vic/Makefile                      | 15 ---------------
 7 files changed, 2 insertions(+), 24 deletions(-)
 rename wr_minic/{README => README.minic} (100%)
 rename wr_vic/README => wr_minic/README.vic (100%)
 rename {wr_vic => wr_minic}/wr_vic.c (100%)
 rename {wr_vic => wr_minic}/wr_vic.h (100%)
 delete mode 100644 wr_vic/Makefile

diff --git a/Makefile b/Makefile
index 13d7bfe3..22e0f372 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,5 @@
 
-export WR_MODULES_DIR = $(shell /bin/pwd)
-
-DIRS = wr_vic wr_minic
+DIRS = wr_minic
 
 # We may "LINUX ?= /usr/src/linux-wrswitch", but it's better to leave it empty
 
diff --git a/wr_minic/Makefile b/wr_minic/Makefile
index 2596bf79..18365d8f 100644
--- a/wr_minic/Makefile
+++ b/wr_minic/Makefile
@@ -1,10 +1,5 @@
 
-obj-m := wr_minic.o
-
-# This is needed to include wr_vic.h
-WR_MODULES_DIR ?= $(shell /bin/pwd)/..
-
-EXTRA_CFLAGS = -I$(WR_MODULES_DIR)/wr_vic
+obj-m := wr_vic.o wr_minic.o
 
 export ARCH ?= arm
 export CROSS_COMPILE ?= $(CROSS_COMPILE_ARM)
diff --git a/wr_minic/README b/wr_minic/README.minic
similarity index 100%
rename from wr_minic/README
rename to wr_minic/README.minic
diff --git a/wr_vic/README b/wr_minic/README.vic
similarity index 100%
rename from wr_vic/README
rename to wr_minic/README.vic
diff --git a/wr_vic/wr_vic.c b/wr_minic/wr_vic.c
similarity index 100%
rename from wr_vic/wr_vic.c
rename to wr_minic/wr_vic.c
diff --git a/wr_vic/wr_vic.h b/wr_minic/wr_vic.h
similarity index 100%
rename from wr_vic/wr_vic.h
rename to wr_minic/wr_vic.h
diff --git a/wr_vic/Makefile b/wr_vic/Makefile
deleted file mode 100644
index ccf615c3..00000000
--- a/wr_vic/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-
-obj-m := wr_vic.o
-
-export ARCH ?= arm
-export CROSS_COMPILE ?= $(CROSS_COMPILE_ARM)
-
-all modules:
-	$(MAKE) CONFIG_DEBUG_SECTION_MISMATCH=y \
-		-C $(LINUX) SUBDIRS=$(shell /bin/pwd) modules
-
-# We might "$(MAKE) -C $(LINUX)" but "make clean" with no LINUX defined
-# is sometimes useful to have
-clean:
-	rm -f *.mod.c *.o *.ko .*cmd Module.symvers modules.order
-	rm -rf .tmp_versions
-- 
2.18.1