Move kernel stuff to under kernel/

(merged branch /zaptel/team/tzafrir/move )

Closes issue #7117.


git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@3793 5390a7c7-147a-4af0-8ec9-7488f05a26cb

1 files changed, 29 insertions, 37 deletions

diff --git a/Makefile b/Makefile
index 0f01537..f7fb84a 100644
--- a/Makefile
+++ b/Makefile
@@ -105,10 +105,10 @@ ifeq ($(findstring xpp,$(MENUSELECT_MODULES)),)
   BUILD_XPP:=yes
 endif
 
-SUBDIRS_UTILS_ALL:= xpp/utils ppp
+SUBDIRS_UTILS_ALL:= kernel/xpp/utils ppp
 SUBDIRS_UTILS	:=
 ifeq ($(BUILD_XPP),yes)
-  SUBDIRS_UTILS	+= xpp/utils
+  SUBDIRS_UTILS	+= kernel/xpp/utils
 endif
 #SUBDIRS_UTILS	+= ppp
 
@@ -122,6 +122,8 @@ BUILD_MODULES:=$(BUILD_TOPDIR_MODULES) $(BUILD_SUBDIR_MODULES)
 
 MOD_DESTDIR:=zaptel
 
+KERN_DIR:=kernel
+
 #NOTE NOTE NOTE
 #
 # all variables set before the include of Makefile.kernel26 are needed by the 2.6 kernel module build process
@@ -137,15 +139,15 @@ else
 KBUILD_OBJ_M=$(BUILD_TOPDIR_MODULES:%=%.o) $(BUILD_SUBDIR_MODULES:%=%/)
 
 ifeq ($(BUILDVER),linux24)
-  INSTALL_MODULES:=$(BUILD_TOPDIR_MODULES:%=%.o)
+  INSTALL_MODULES:=$(BUILD_TOPDIR_MODULES:%=$(KERN_DIR)/%.o)
   INSTALL_MODULES+=$(foreach mod,$(BUILD_SUBDIR_MODULES),$(mod)/$(mod).o)
-  ALL_MODULES:=$(TOPDIR_MODULES:%=%.o)
-  ALL_MODULES+=$(SUBDIR_MODULES:%=%/%.o)
+  ALL_MODULES:=$(TOPDIR_MODULES:%=$(KERN_DIR)/%.o)
+  ALL_MODULES+=$(SUBDIR_MODULES:%=$(KERN_DIR)/%/%.o)
 else
-  INSTALL_MODULES:=$(BUILD_TOPDIR_MODULES:%=%.ko)
-  INSTALL_MODULES+=$(foreach mod,$(filter-out xpp,$(BUILD_SUBDIR_MODULES)),$(mod)/$(mod).ko)
+  INSTALL_MODULES:=$(BUILD_TOPDIR_MODULES:%=$(KERN_DIR)/%.ko)
+  INSTALL_MODULES+=$(foreach mod,$(filter-out xpp,$(BUILD_SUBDIR_MODULES)),$(KERN_DIR)/$(mod)/$(mod).ko)
   ifneq ($(filter xpp,$(BUILD_SUBDIR_MODULES)),)
-  INSTALL_MODULES+=$(patsubst %,xpp/%.ko,xpp_usb xpd_fxo xpd_fxs xpp)
+  INSTALL_MODULES+=$(patsubst %,$(KERN_DIR)/xpp/%.ko,xpp_usb xpd_fxo xpd_fxs xpp)
   endif
 
   ALL_MODULES:=$(TOPDIR_MODULES:%=%.ko)
@@ -186,8 +188,13 @@ MODULE_ALIASES=wcfxs wctdm8xxp wct2xxp
 
 KFLAGS+=-DSTANDALONE_ZAPATA
 CFLAGS+=-DSTANDALONE_ZAPATA
-KMAKE  = $(MAKE) -C $(KSRC) SUBDIRS=$(PWD) \
+ifeq ($(BUILDVER),linux24)
+KMAKE	= $(MAKE) -C kernel HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE) \
+  BUILD_TOPDIR_MODULES="$(BUILD_TOPDIR_MODULES)" BUILD_SUBDIR_MODULES="$(BUILD_SUBDIR_MODULES)"
+else
+KMAKE  = $(MAKE) -C $(KSRC) SUBDIRS=$(PWD)/kernel \
   HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE) KBUILD_OBJ_M="$(KBUILD_OBJ_M)"
+endif
 KMAKE_INST = $(KMAKE) \
   INSTALL_MOD_PATH=$(DESTDIR) INSTALL_MOD_DIR=misc modules_install
 
@@ -291,13 +298,13 @@ programs: libs utils
 
 utils: $(BINS) utils-subdirs
 
-modules: prereq
+modules: 
 	@if [ -z "$(KSRC)" -o ! -d "$(KSRC)" ]; then echo "You do not appear to have the sources for the $(KVERS) kernel installed."; exit 1 ; fi
-ifeq ($(BUILDVER),linux26)
+#ifeq ($(BUILDVER),linux26)
 	$(KMAKE) modules
-else
-modules: $(INSTALL_MODULES)
-endif
+#else
+#modules: $(INSTALL_MODULES)
+#endif
 
 ifeq ($(HPEC_PRESENT),yes)
 ifeq ($(ARCH),i386)
@@ -327,26 +334,17 @@ zonedata.lo: zonedata.c
 tonezone.lo: tonezone.c
 	$(CC) -c $(CFLAGS) -o $@ $^
 
-tor2fw.h: tormenta2.rbt makefw 
-	./makefw $< tor2fw > $@
-
-radfw.h: pciradio.rbt makefw
-	./makefw $< radfw > $@
-
-makefw: makefw.c
-	$(HOSTCC) -o $@ $^
-
 prereq: config.status tor2fw.h radfw.h version.h
 
-zttool.o: zaptel.h
+zttool.o: kernel/zaptel.h
 zttool.o: CFLAGS+=$(NEWT_INCLUDE)
 zttool: LDLIBS+=$(NEWT_LIB)
 
-ztscan.o: zaptel.h
+ztscan.o: kernel/zaptel.h
 
-ztprovision.o: zaptel.h
+ztprovision.o: kernel/zaptel.h
 
-ztmonitor.o: zaptel.h
+ztmonitor.o: kernel/zaptel.h
 
 ztspeed: CFLAGS=
 
@@ -359,7 +357,7 @@ $(LTZ_A): $(LTZ_A_OBJS)
 $(LTZ_SO): $(LTZ_SO_OBJS)
 	$(CC) $(CFLAGS) -shared -Wl,-soname,$(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER) -o $@ $^ $(LDFLAGS) $(LDLIBS) -lm
 
-ztcfg.o: ztcfg.h zaptel.h
+ztcfg.o: ztcfg.h kernel/zaptel.h
 ztcfg: ztcfg.o $(LTZ_A)
 ztcfg: LDLIBS+=-lm
 
@@ -516,7 +514,7 @@ install-utils-subdirs:
 	done
 
 install-include:
-	$(INSTALL) -D -m 644 zaptel.h $(DESTDIR)$(INC_DIR)/zaptel.h
+	$(INSTALL) -D -m 644 kernel/zaptel.h $(DESTDIR)$(INC_DIR)/zaptel.h
 
 devices:
 ifndef DYNFS
@@ -603,7 +601,7 @@ endif
 	@echo "optimal value for the variable MODULES ."
 	@echo ""
 	@echo "I think that the zaptel hardware you have on your system is:"
-	@xpp/utils/zaptel_hardware || true
+	@kernel/xpp/utils/zaptel_hardware || true
 
 
 update:
@@ -622,17 +620,11 @@ update:
 
 clean:
 	-@$(MAKE) -C menuselect clean
-	rm -f torisatool makefw tor2fw.h radfw.h
+	rm -f torisatool
 	rm -f $(BINS)
 	rm -f *.o ztcfg tzdriver sethdlc sethdlc-new
 	rm -f $(LTZ_SO) $(LTZ_A) *.lo
-ifeq ($(BUILDVER),linux26)
-  ifneq (,$(KSRC))
 	$(KMAKE) clean
-  endif
-else
-	$(MAKE) -C wct4xxp clean
-endif
 	@for dir in $(SUBDIRS_UTILS_ALL); do \
 		$(MAKE) -C $$dir clean; \
 	done