SOURCES: zaptel-make.patch - updated

[arekm]

Author: arekm                        Date: Wed Apr 18 21:13:53 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   zaptel-make.patch (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: SOURCES/zaptel-make.patch
diff -u SOURCES/zaptel-make.patch:1.10 SOURCES/zaptel-make.patch:1.11
--- SOURCES/zaptel-make.patch:1.10	Thu Mar  8 13:14:35 2007
+++ SOURCES/zaptel-make.patch	Wed Apr 18 23:13:48 2007
@@ -1,61 +1,30 @@
---- zaptel-1.2.15.orig/Makefile	2007-03-02 23:29:04.000000000 +0100
-+++ zaptel-1.2.15/Makefile	2007-03-08 11:11:05.212766000 +0100
-@@ -52,7 +52,7 @@
- 
- MODULES:=zaptel tor2 torisa wcusb wcfxo wctdm wctdm24xxp \
- 	 ztdynamic ztd-eth wct1xxp wcte11xp pciradio \
--         ztd-loc wcte12xp # ztdummy
-+         ztd-loc wcte12xp ztdummy
- #MODULES+=wcfxsusb
- ifeq ($(BUILDVER),linux26)
- MODULES+=ztdummy zttranscode
-@@ -93,12 +93,12 @@
- 
- INSTALL_PREFIX:=$(DESTDIR)
- 
--CFLAGS+=-I. -O4 -g -Wall
-+CFLAGS+=-I. $(OPTFLAGS) -g -Wall
- CFLAGS_PPC:=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
- CFLAGS_X86-64:=$(shell if uname -m | grep -q x86_64; then echo "-m64"; fi)
- CFLAGS+=$(CFLAGS_PPC) $(CFLAGS_X86-64)
- LCFLAGS:=-fPIC $(CFLAGS) -DBUILDING_TONEZONE
--KFLAGS:=-I$(KINCLUDES) -O6
-+KFLAGS:=-I$(KINCLUDES) $(OPTFLAGS)
+diff -urN zaptel-1.4.1.org/Makefile zaptel-1.4.1/Makefile
+--- zaptel-1.4.1.org/Makefile	2007-03-23 03:11:12.000000000 +0100
++++ zaptel-1.4.1/Makefile	2007-04-18 23:05:43.346414984 +0200
+@@ -145,7 +145,7 @@
+ endif
+ CFLAGS+=$(CFLAGS_PPC) $(CFLAGS_x86_64)
+ LCFLAGS=-fPIC $(CFLAGS) -DBUILDING_TONEZONE
+-KFLAGS=-I$(KINCLUDES) -O6
++KFLAGS=-I$(KINCLUDES) $(OPTFLAGS)
  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))
-@@ -353,21 +353,6 @@
- 		install -D -m 755 sethdlc $(INSTALL_PREFIX)/sbin/sethdlc ; \
- 	fi
- 	if [ -f zttool ]; then install -D -m 755 zttool $(INSTALL_PREFIX)/sbin/zttool; fi
--ifeq ($(BUILDVER),linux26)
--	for x in $(MODULESKO); do \
--		rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/extra/$$x ; \
--	done; \
--	$(KMAKE_INST);
--else
--	for x in $(MODULESO) wct4xxp/wct4xxp.o; do \
--		install -D -m 644 $$x $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/$$x ; \
--	done;
--
--endif
--	if ! [ -f wcfxsusb.o ]; then \
--		rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/wcfxsusb.o; \
--	fi; \
--	rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/wcfxs.o
- 	install -D -m 755 $(LIBTONEZONE_SO) $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER)
- 	[ `id -u` = 0 ] && /sbin/ldconfig || :
- 	rm -f $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
-@@ -381,12 +366,7 @@
- 	install -D -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include/tonezone.h
- 	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) "$(INSTALL_PREFIX)" "$(filter-out zaptel ztdummy zttranscode wctc4xxp ztdynamic xpp_usb,$(MODULES)) $(MODULE_ALIASES)"
--	@if [ -d /etc/modutils ]; then \
--		/sbin/update-modules ; \
--	fi
+@@ -212,7 +212,7 @@
+ all: menuselect.makeopts 
+ 	@$(MAKE) _all
+ 
+-_all: $(if $(BUILD_MODULES),modules) programs $(LTZ_SO) $(LTZ_A)
++_all: programs $(LTZ_SO) $(LTZ_A)
  
- install-udev: devices
+ xpp-utils:
+ ifeq (yes,$(BUILD_XPP))
+@@ -386,7 +386,7 @@
+ $(UTILSO): %.o: %.c
+ 	$(CC) $(CFLAGS) -o $@ -c $<
  
+-install: all devices install-modules install-libs install-include install-xpp
++install: all devices install-libs install-include install-xpp
+ ifeq ($(HOTPLUG_FIRMWARE),yes)
+ 	$(MAKE) -C firmware hotplug-install
+ endif
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/zaptel-make.patch?r1=1.10&r2=1.11&f=u