--- slmodem-2.9.11-20080417/drivers/Makefile.orig 2008-06-10 14:26:58.000000000 +0000 +++ slmodem-2.9.11-20080417/drivers/Makefile 2008-06-10 14:32:07.000000000 +0000 @@ -23,13 +23,14 @@ ARCH64:=$(shell uname -m | sed -e '/amd64/s//x86_64/' | grep -c x86_64) ifeq ($(ARCH64), 0) -obj-m:= slamr.o slusb.o -else -obj-m:= slusb.o +obj-m:= slamr.o +#obj-m:= slamr.o slusb.o +#else +#obj-m:= slusb.o endif slamr-objs:= amrmo_init.o sysdep_amr.o amrlibs.o -slusb-objs:= st7554.o +#slusb-objs:= st7554.o ifndef KERNELRELEASE ifndef KERNEL_VER @@ -52,18 +53,18 @@ mkdir -p ${DESTDIR}/dev $(foreach minor,0 1 2 3, \ mknod -m 600 ${DESTDIR}/dev/slamr$(minor) c 242 $(minor) ; ) echo -n - $(foreach minor,0 1 2 3, \ - mknod -m 600 ${DESTDIR}/dev/slusb$(minor) c 243 $(minor) ; ) echo -n +# $(foreach minor,0 1 2 3, \ +# mknod -m 600 ${DESTDIR}/dev/slusb$(minor) c 243 $(minor) ; ) echo -n remove-devices: $(foreach minor,0 1 2 3, \ $(RM) ${DESTDIR}/dev/slamr$(minor) ; ) echo -n - $(foreach minor,0 1 2 3, \ - $(RM) ${DESTDIR}/dev/slusb$(minor) ; ) echo -n +# $(foreach minor,0 1 2 3, \ +# $(RM) ${DESTDIR}/dev/slusb$(minor) ; ) echo -n else ifeq ($(findstring 2.4,$(KERNEL_VER)),2.4) -slusb-objs:= old_st7554.o +#slusb-objs:= old_st7554.o obj:=. module-dir:=${DESTDIR}/lib/modules/$(KERNEL_VER)/misc @@ -72,30 +73,33 @@ all: $(obj-m) slamr.o: $(slamr-objs) -slusb.o: $(slusb-objs) -slamr.o slusb.o: +#slusb.o: $(slusb-objs) +#slamr.o slusb.o: +slamr.o : $(LD) -r -o $@ $^ install: uninstall-old ifeq ($(ARCH64), 0) install -D -m 644 slamr.o $(module-dir)/slamr.o endif - install -D -m 644 slusb.o $(module-dir)/slusb.o +# install -D -m 644 slusb.o $(module-dir)/slusb.o cp /etc/modules.conf /etc/modules.conf.slamr && \ echo 'alias char-major-242 slamr' >> /etc/modules.conf && \ - echo 'alias char-major-243 slusb' >> /etc/modules.conf +# echo 'alias char-major-243 slusb' >> /etc/modules.conf /sbin/depmod -a uninstall: - /sbin/modprobe -r slamr slusb +# /sbin/modprobe -r slamr slusb + /sbin/modprobe -r slamr cp /etc/modules.conf /etc/modules.conf.slamr && \ - egrep -ve 'alias char-major-242 slamr|alias char-major-243 slusb' /etc/modules.conf.slamr > /etc/modules.conf + egrep -ve 'alias char-major-242 slamr' /etc/modules.conf.slamr > /etc/modules.conf +# egrep -ve 'alias char-major-242 slamr|alias char-major-243 slusb' /etc/modules.conf.slamr > /etc/modules.conf $(RM) $(module-dir)/slamr.o - $(RM) $(module-dir)/slusb.o +# $(RM) $(module-dir)/slusb.o /sbin/depmod -a uninstall-old: $(RM) $(module-dir)/slmdm.o \ $(module-dir)/slfax.o \ - $(module-dir)/slusb.o \ +# $(module-dir)/slusb.o \ $(module-dir)/slamrmo.o \ $(module-dir)/slmodem.o # remove old 2.7,2.8 version @@ -112,15 +116,15 @@ ifeq ($(ARCH64), 0) install -D -m 644 slamr.ko $(module-dir)/slamr.ko endif - install -D -m 644 slusb.ko $(module-dir)/slusb.ko +# install -D -m 644 slusb.ko $(module-dir)/slusb.ko /sbin/depmod -a uninstall: ifeq ($(ARCH64), 0) modprobe -r slamr ; echo -n endif - modprobe -r slusb ; echo -n +# modprobe -r slusb ; echo -n $(RM) $(module-dir)/slamr.ko - $(RM) $(module-dir)/slusb.ko +# $(RM) $(module-dir)/slusb.ko /sbin/depmod -a endif