move kmod to top level directory

2016-08-23 08:57:55 +02:00 · 2016-08-23 08:57:55 +02:00 · f4a2bae666
commit f4a2bae666
parent 7bb46f9927
14 changed files with 12 additions and 3 deletions
--- a/kmod/Makefile
+++ b/kmod/Makefile
@ -0,0 +1,9 @@
+obj-m += smartcapwap.o
+
+smartcapwap-y := \
+	main.o \
+	netlinkapp.o \
+	capwap.o \
+	capwap_private.o
+
+CFLAGS_capwap.o = -I$(src)
--- a/src/kmod/capwap-trace.h
+++ b/src/kmod/capwap-trace.h
--- a/src/kmod/capwap.c
+++ b/src/kmod/capwap.c
--- a/src/kmod/capwap.h
+++ b/src/kmod/capwap.h
--- a/src/kmod/capwap_private.c
+++ b/src/kmod/capwap_private.c
--- a/src/kmod/capwap_private.h
+++ b/src/kmod/capwap_private.h
--- a/src/kmod/capwap_rfc.h
+++ b/src/kmod/capwap_rfc.h
--- a/src/kmod/config.h
+++ b/src/kmod/config.h
--- a/src/kmod/main.c
+++ b/src/kmod/main.c
--- a/src/kmod/netlinkapp.c
+++ b/src/kmod/netlinkapp.c
--- a/src/kmod/netlinkapp.h
+++ b/src/kmod/netlinkapp.h
--- a/src/kmod/nlsmartcapwap.h
+++ b/src/kmod/nlsmartcapwap.h
--- a/openwrt/Makefile
+++ b/openwrt/Makefile
@ -74,7 +74,7 @@ define Build/Compile/wtp
 endef

 NOSTDINC_FLAGS = \
-        -I$(PKG_BUILD_DIR)/src/kmod \
+        -I$(PKG_BUILD_DIR)/kmod \
        -I$(STAGING_DIR)/usr/include/mac80211-backport \
        -I$(STAGING_DIR)/usr/include/mac80211/uapi \
        -I$(STAGING_DIR)/usr/include/mac80211 \
@ -85,7 +85,7 @@ define Build/Compile/kmod
 	+$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \
 		ARCH="$(LINUX_KARCH)" \
 		CROSS_COMPILE="$(KERNEL_CROSS)" \
-		SUBDIRS="$(PKG_BUILD_DIR)/src/kmod" \
+		SUBDIRS="$(PKG_BUILD_DIR)/kmod" \
 		NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \
 		modules
 endef
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -31,7 +31,7 @@ endif
 AM_CFLAGS += \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/kmod \
+	-I$(top_srcdir)/kmod \
 	-I$(top_srcdir)/lib/binding/ieee80211 \
 	-I$(top_srcdir)/src/binding/ieee80211