[zaptel-commits] tzafrir: branch tzafrir/kernelmove_14 r2702 - in /team/tzafrir/kernelmove_14:...

SVN commits to the Zaptel project zaptel-commits at lists.digium.com
Fri Jul 6 16:36:57 CDT 2007


Author: tzafrir
Date: Fri Jul  6 16:36:57 2007
New Revision: 2702

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2702
Log:
* Moved the octasic API directory under the kernel as well.
* More slashing of the 2.4 kernel makefile.

Added:
    team/tzafrir/kernelmove_14/kernel/Makefile.octasic
      - copied unchanged from r2592, team/tzafrir/kernelmove/kernel/Makefile.octasic
Modified:
    team/tzafrir/kernelmove_14/   (props changed)
    team/tzafrir/kernelmove_14/kernel/   (props changed)
    team/tzafrir/kernelmove_14/kernel/makefile
    team/tzafrir/kernelmove_14/kernel/wct4xxp/Makefile.kernel26

Propchange: team/tzafrir/kernelmove_14/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Fri Jul  6 16:36:57 2007
@@ -1,2 +1,1 @@
 menuselect https://origsvn.digium.com/svn/menuselect/branches/1.0
-oct612x http://svn.digium.com/svn/octasic_api/oct612x/tags/PR47-00/software

Propchange: team/tzafrir/kernelmove_14/kernel/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Fri Jul  6 16:36:57 2007
@@ -1,0 +1,1 @@
+oct612x http://svn.digium.com/svn/octasic_api/oct612x/tags/PR47-00/software

Modified: team/tzafrir/kernelmove_14/kernel/makefile
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/kernel/makefile?view=diff&rev=2702&r1=2701&r2=2702
==============================================================================
--- team/tzafrir/kernelmove_14/kernel/makefile (original)
+++ team/tzafrir/kernelmove_14/kernel/makefile Fri Jul  6 16:36:57 2007
@@ -53,67 +53,38 @@
 ALL_MODULES:=$(TOPDIR_MODULES:%=%.o)
 ALL_MODULES+=$(SUBDIR_MODULES:%=%/%.o)
 
-CFLAGS+=-I. -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
+CFLAGS		+= -I. -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
+KFLAGS		= -I$(KINCLUDES)
+KFLAGS		+= -DMODULE -D__KERNEL__ -DEXPORT_SYMTAB -I$(KSRC)/drivers/net \
+	-Wall -I. -Wstrict-prototypes -fomit-frame-pointer \
+	-I$(KSRC)/drivers/net/wan -I$(KINCLUDES)/net \
+	-DMODVERSIONS -include $(KINCLUDES)/linux/modversions.h
+
 ifneq (,$(findstring ppc,$(UNAME_M)))
-CFLAGS_PPC:=-fsigned-char
+  KFLAGS	+= -msoft-float -fsigned-char
 endif
 ifneq (,$(findstring x86_64,$(UNAME_M)))
-CFLAGS_x86_64:=-m64
-endif
-CFLAGS+=$(CFLAGS_PPC) $(CFLAGS_x86_64)
-LCFLAGS=-fPIC $(CFLAGS) -DBUILDING_TONEZONE
-KFLAGS=-I$(KINCLUDES) -O6
-KFLAGS+=-DMODULE -D__KERNEL__ -DEXPORT_SYMTAB -I$(KSRC)/drivers/net \
-	-Wall -I. -Wstrict-prototypes -fomit-frame-pointer -I$(KSRC)/drivers/net/wan -I$(KINCLUDES)/net
-ifneq (,$(wildcard $(KINCLUDES)/linux/modversions.h))
-  KFLAGS+=-DMODVERSIONS -include $(KINCLUDES)/linux/modversions.h
-endif
-ifneq (,$(findstring ppc,$(UNAME_M)))
-KFLAGS_PPC:=-msoft-float -fsigned-char
-endif
-KFLAGS+=$(KFLAGS_PPC)
-ifeq ($(KVERS_MAJ),2.4)
-  ifneq (,$(findstring x86_64,$(UNAME_M)))
-    KFLAGS+=-mcmodel=kernel
-  endif
+  KFLAGS	+= -mcmodel=kernel
 endif
 
-#
-# Features are now configured in zconfig.h
-#
-
-MODULE_ALIASES=wcfxs wctdm8xxp wct2xxp
-
 KFLAGS+=-DSTANDALONE_ZAPATA
-CFLAGS+=-DSTANDALONE_ZAPATA
 
 ROOT_PREFIX=
 INSTALL_PREFIX=$(DESTDIR)
 
 CONFIG_FILE=$(INSTALL_PREFIX)/etc/zaptel.conf
-CFLAGS+=-DZAPTEL_CONFIG=\"$(CONFIG_FILE)\"
-
-CHKCONFIG:=$(shell sh -c 'type -p chkconfig' 2> /dev/null)
-ifndef CHKCONFIG
-CHKCONFIG:=:
-endif
-
-ifneq ($(wildcard .version),)
-  ZAPTELVERSION:=$(shell cat .version)
-else
-ifneq ($(wildcard .svn),)
-  ZAPTELVERSION=SVN-$(shell build_tools/make_svn_branch_name)
-endif
-endif
 
 MOD_DIR:=$(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc
 
-BINS:=fxotune fxstest sethdlc-new ztcfg ztdiag ztmonitor ztspeed zttest zttool
-UTILS:=$(filter-out zttool fxstest ztcfg,$(BINS))
-UTILSO:=$(UTILS:%=%.o)
-BINS:=$(filter-out $(MENUSELECT_UTILS),$(BINS))
+SUBDIR_INC	:= $(ZAP_SUBDIRS:%=%/Makefile.linux24)
+MODULESO	:= $(MODULES:%=%.o)
+TARGETS		:= $(MODULESO)
+MODS_MINOR	:=
 
 all: modules
+
+include Makefile.octasic
+include $(wildcard $(SUBDIR_INC))
 
 modules: $(INSTALL_MODULES)
 
@@ -157,8 +128,8 @@
 data:
 	$(MAKE) -C datamods datamods
 
-wct4xxp/wct4xxp.o:
-	$(MAKE) -C wct4xxp KFLAGS="$(KFLAGS) -I.." CFLAGS="$(CFLAGS) -I.."
+#wct4xxp/wct4xxp.o:
+#	$(MAKE) -C wct4xxp KFLAGS="$(KFLAGS) -I.." CFLAGS="$(CFLAGS) -I.."
 
 tor2.o: tor2-hw.h tor2fw.h
 
@@ -184,52 +155,14 @@
 
 zaptel.c: tones.h
 
-$(UTILS): %: %.o
-	$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(LDLIBS)
-
-$(UTILSO): %.o: %.c
-	$(CC) $(CFLAGS) -o $@ -c $<
-
-install: all devices install-modules install-libs install-include install-xpp
-ifeq ($(HOTPLUG_FIRMWARE),yes)
-	$(MAKE) -C firmware hotplug-install
-endif
-	if [ -f ztcfg ]; then \
-		$(INSTALL) -D -m 755 ztcfg $(INSTALL_PREFIX)/sbin/ztcfg; \
-	fi
-	if [ -f sethdlc-new ]; then \
-		$(INSTALL) -D -m 755 sethdlc-new $(INSTALL_PREFIX)/sbin/sethdlc; \
-	elif [ -f sethdlc ]; then \
-		$(INSTALL) -D -m 755 sethdlc $(INSTALL_PREFIX)/sbin/sethdlc; \
-	fi
-	if [ -f zttool ]; then \
-		$(INSTALL) -D -m 755 zttool $(INSTALL_PREFIX)/sbin/zttool; \
-	fi
-	$(INSTALL) -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8
-	$(INSTALL) -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
-	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
-	[ -f $(CONFIG_FILE) ] || $(INSTALL) -D -m 644 zaptel.conf.sample $(CONFIG_FILE)
-	build_tools/genmodconf $(BUILDVER) "$(ROOT_PREFIX)" "$(filter-out zaptel ztdummy xpp zttranscode ztdynamic,$(BUILD_MODULES)) $(MODULE_ALIASES)"
-	@if [ -d /etc/modutils ]; then \
-		/sbin/update-modules ; \
-	fi
-
-install-modules: $(INSTALL_MODULES) uninstall-modules
-ifeq ($(BUILDVER),linux24)
+install: all
 	$(INSTALL) -d $(MOD_DIR)
 	$(INSTALL) -m 644 $(INSTALL_MODULES) $(MOD_DIR)
-else
-	$(KMAKE_INST)
-	if [ -f datamods/syncppp.ko ]; then \
-		$(MAKE) -C datamods install; \
-	fi
-endif
 
 clean:
 	rm -f makefw tor2fw.h radfw.h
 	rm -f *.o 
-	rm -f $(LTZ_SO) $(LTZ_A) *.lo
-	$(MAKE) -C wct4xxp clean
+	#$(MAKE) -C wct4xxp clean
 	$(MAKE) -C firmware clean
 	rm -rf .tmp_versions
 	rm -f gendigits tones.h
@@ -241,4 +174,4 @@
 
 #.EXPORT_ALL_VARIABLES:
 
-.PHONY: distclean dist-clean clean version.h all install modules data install-modules uninstall-modules
+.PHONY: distclean dist-clean clean version.h all install modules data

Modified: team/tzafrir/kernelmove_14/kernel/wct4xxp/Makefile.kernel26
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/kernel/wct4xxp/Makefile.kernel26?view=diff&rev=2702&r1=2701&r2=2702
==============================================================================
--- team/tzafrir/kernelmove_14/kernel/wct4xxp/Makefile.kernel26 (original)
+++ team/tzafrir/kernelmove_14/kernel/wct4xxp/Makefile.kernel26 Fri Jul  6 16:36:57 2007
@@ -1,23 +1,21 @@
 obj-m += wct4xxp.o
 
-OCT_CFLAGS	:= $(shell $(src)/../../oct612x/octasic-helper cflags  $(src)/../../oct612x)
-OCT_OBJS	:= $(shell $(src)/../../oct612x/octasic-helper objects ../../oct612x)
+OCT_CFLAGS	:= $(shell $(src)/../oct612x/octasic-helper cflags  $(src)/../oct612x)
+OCT_OBJS	:= $(shell $(src)/../oct612x/octasic-helper objects ../oct612x)
 
 EXTRA_CFLAGS := -I$(src)/.. $(OCT_CFLAGS) -Wno-undef -DSTANDALONE_ZAPATA 
+FIRM_OBJS	:= $(obj)/../../firmware/zaptel-fw-oct6114-064.o $(obj)/../../firmware/zaptel-fw-oct6114-128.o
+
+wct4xxp-objs := base.o vpm450m.o $(OCT_OBJS)
 
 ifeq ($(HOTPLUG_FIRMWARE),yes)
 EXTRA_CFLAGS	+= -DHOTPLUG_FIRMWARE
 else
-wct4xxp-objs += $(obj)/../../firmware/zaptel-fw-oct6114-064.o $(obj)/../../firmware/zaptel-fw-oct6114-128.o
+wct4xxp-objs += $(FIRM_OBJS)
 endif
 
-wct4xxp-objs := base.o vpm450m.o $(OCT_OBJS)
-
-$(obj)/../firmware/zaptel-fw-oct6114-064.o: $(obj)/base.o
-	$(MAKE) -C $(obj)/../../firmware zaptel-fw-oct6114-064.o
-
-$(obj)/../firmware/zaptel-fw-oct6114-128.o: $(obj)/base.o
-	$(MAKE) -C $(obj)/../../firmware zaptel-fw-oct6114-128.o
+$(FIRM_OBJS): %: $(obj)/base.o
+	$(MAKE) -C ${@d} ${@f}
 
 $(obj)/base.o: $(src)/vpm450m.h $(src)/wct4xxp.h
 $(obj)/base.o: $(src)/../zaptel.h




More information about the zaptel-commits mailing list