Gentoo Attachment #40732 for bug #65743

View | Details | Raw Unified
Collapse All | Expand All

(-) slmodem-2.9.10.orig/Makefile (-5 / +11 lines)

Lines 13-19	Link Here

###########################################################################

###########################################################################

KERNEL_DIR:=/lib/modules/$(shell uname -r)/build

KERNEL_VER:=$(shell uname -r)

KERNEL_DIR:=/lib/modules/$(KERNEL_VER)/build

KERNEL_OUTPUT_DIR:=$(KERNEL_DIR)

# tools

# tools

INSTALL:=install

INSTALL:=install

Lines 29-49	Link Here

	$(RM) -rf ${DESTDIR}/var/lib/slmodem

	$(RM) -rf ${DESTDIR}/var/lib/slmodem

	$(INSTALL) -d -D -m 755 ${DESTDIR}/var/lib/slmodem

	$(INSTALL) -d -D -m 755 ${DESTDIR}/var/lib/slmodem

install-test:

	$(INSTALL) -D -m 755 modem/modem_test ${DESTDIR}/usr/sbin/modem_test

uninstall: uninstall-drivers

uninstall: uninstall-drivers

	$(RM) ${DESTDIR}/usr/sbin/slmodemd

	$(RM) ${DESTDIR}/usr/sbin/slmodemd

	$(RM) -rf ${DESTDIR}/var/lib/slmodem

	$(RM) -rf ${DESTDIR}/var/lib/slmodem

drivers:

drivers:

	$(MAKE) -C drivers KERNEL_DIR=$(KERNEL_DIR)

	$(MAKE) -C drivers

install-drivers: drivers

install-drivers: drivers

	$(MAKE) install -C drivers KERNEL_DIR=$(KERNEL_DIR)

	$(MAKE) install -C drivers

uninstall-drivers:

uninstall-drivers:

	$(MAKE) uninstall -C drivers KERNEL_DIR=$(KERNEL_DIR)

	$(MAKE) uninstall -C drivers

# misc rules

# misc rules

sub-dirs:= modem drivers

sub-dirs:= modem drivers

.PHONY: $(sub-dirs) all old clean dep install

.PHONY: $(sub-dirs) all old clean dep install install-drivers install-test uninstall-drivers

clean dep: %: %-sub-dirs

clean dep: %: %-sub-dirs

%-sub-dirs:

%-sub-dirs:

	$(foreach dir,$(sub-dirs),$(MAKE) -C $(dir) $(patsubst %-sub-dirs,%,$@) && ) echo "done."

	$(foreach dir,$(sub-dirs),$(MAKE) -C $(dir) $(patsubst %-sub-dirs,%,$@) && ) echo "done."

(-) slmodem-2.9.10.orig/drivers/Makefile (-21 / +39 lines)

Lines 16-24	Link Here

#KBUILD_VERBOSE=1

#KBUILD_VERBOSE=1

#export KBUILD_VERBOSE

#export KBUILD_VERBOSE

KERNEL_DIR:=/lib/modules/$(shell uname -r)/build

ifndef KERNEL_VER

KERNEL_VER:=$(shell uname -r)

endif

ifndef KERNEL_DIR

KERNEL_DIR:=/lib/modules/$(KERNEL_VER)/build

endif

ifndef KERNEL_OUTPUT_DIR

KERNEL_OUTPUT_DIR:=$(KERNEL_DIR)

endif

EXTRA_CFLAGS = -I$(obj) -I$(obj)/../modem

EXTRA_CFLAGS+= -I$(obj) -I$(obj)/../modem

obj-m := slamr.o slusb.o

obj-m := slamr.o slusb.o

Lines 28-66	Link Here

ifndef KERNELRELEASE

ifndef KERNELRELEASE

ifndef KERNEL_VER

ifndef KERNEL_VER

all install uninstall: kernel-ver

all install uninstall:

	$(MAKE) $@ KERNEL_VER=$(shell ./kernel-ver)

	$(MAKE) $@

install: install-devices

install: install-devices

uninstall: remove-devices

uninstall: remove-devices

kernel-ver::

kernel-ver:

	$(CC) -I$(KERNEL_DIR)/include -o $@ $@.c

	$(CC) -I$(KERNEL_DIR)/include -o $@ $@.c

dep:

clean:

	$(RM) kernel-ver $(obj-m) $(obj-m:.o=.ko) *st7554.o amrmo_init.o sysdep_amr.o *.mod.* .*.cmd *~

install-devices:

install-devices:

	mkdir -p ${DESTDIR}/dev

	mkdir -p ${DESTDIR}/dev

	$(foreach minor,0 1 2 3, \

	$(foreach minor,0 1 2 3, \

	    mknod -m 600 ${DESTDIR}/dev/slamr$(minor) c 212 $(minor) ; ) echo -n

	    mknod -m 600 ${DESTDIR}/dev/slamr$(minor) c 212 $(minor) ; ) echo -n

	$(foreach minor,0 1 2 3, \

	$(foreach minor,0 1 2 3, \

	    mknod -m 600 ${DESTDIR}/dev/slusb$(minor) c 213 $(minor) ; ) echo -n

	    mknod -m 600 ${DESTDIR}/dev/slusb$(minor) c 213 $(minor) ; ) echo -n

remove-devices:

remove-devices:

	$(foreach minor,0 1 2 3, \

	    $(RM) ${DESTDIR}/dev/slamr[0-3] ; ) echo -n

	    $(RM) ${DESTDIR}/dev/slamr$(minor) ; ) echo -n

	    $(RM) ${DESTDIR}/dev/slusb[0-3] ; ) echo -n

	$(foreach minor,0 1 2 3, \

	    $(RM) ${DESTDIR}/dev/slusb$(minor) ; ) echo -n

else

else

ifeq ($(findstring 2.4,$(KERNEL_VER)),2.4)

ifeq ($(findstring 2.4,$(KERNEL_VER)),2.4)

# 2.4 kernel

slusb-objs:= old_st7554.o

slusb-objs:= old_st7554.o

obj:=.

obj:=.

module-dir:=${DESTDIR}/lib/modules/$(KERNEL_VER)/misc

module-dir:=${DESTDIR}/lib/modules/$(KERNEL_VER)/misc

CFLAGS:= -Wall -pipe -O3 -fomit-frame-pointer -D__KERNEL__ -DMODULE -DEXPORT_SYMTAB -DMODVERSIONS --include $(KERNEL_DIR)/include/linux/modversions.h -I$(KERNEL_DIR)/include

EXTRA_CFLAGS+=  -D__KERNEL__ -DMODULE -DEXPORT_SYMTAB -DMODVERSIONS --include $(KERNEL_DIR)/include/linux/modversions.h -I$(KERNEL_DIR)/include

all: $(obj-m)

all: $(obj-m)

Lines 69-81	Link Here

slamr.o slusb.o:

slamr.o slusb.o:

	$(LD) -r -o $@ $^

	$(LD) -r -o $@ $^

install: uninstall-old

install: install-modules

	mkdir -p $(DESTDIR)/etc && \

	cp /etc/modules.conf $(DESTDIR)/etc/modules.conf.slamr && \

	echo 'alias char-major-212 slamr' >> $(DESTDIR)/etc/modules.conf && \

	echo 'alias char-major-213 slusb' >> $(DESTDIR)/etc/modules.conf

#	/sbin/depmod -a

install-modules: uninstall-old

	install -D -m 644 slamr.o $(module-dir)/slamr.o

	install -D -m 644 slamr.o $(module-dir)/slamr.o

	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-212 slamr' >> /etc/modules.conf && \

	    echo 'alias char-major-213 slusb' >> /etc/modules.conf

	/sbin/depmod -a

uninstall:

uninstall:

	/sbin/modprobe -r slamr slusb

	/sbin/modprobe -r slamr slusb

	cp /etc/modules.conf /etc/modules.conf.slamr && \

	cp /etc/modules.conf /etc/modules.conf.slamr && \

Lines 83-88	Link Here

	$(RM) $(module-dir)/slamr.o

	$(RM) $(module-dir)/slamr.o

	$(RM) $(module-dir)/slusb.o

	$(RM) $(module-dir)/slusb.o

	/sbin/depmod -a

	/sbin/depmod -a

uninstall-old:

uninstall-old:

	$(RM) $(module-dir)/slmdm.o \

	$(RM) $(module-dir)/slmdm.o \

              $(module-dir)/slfax.o \

              $(module-dir)/slfax.o \

Lines 94-108	Link Here

	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$@) -o $@ -c $<

	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$@) -o $@ -c $<

else

else

# 2.6 Kernel

EXTRA_CFLAGS+=-I $(KERNEL_INCLUDE_DIR) -I .

module-dir:=${DESTDIR}/lib/modules/$(KERNEL_VER)/extra

module-dir:=${DESTDIR}/lib/modules/$(KERNEL_VER)/extra

all:

all:

	$(MAKE) modules -C $(KERNEL_DIR) SUBDIRS=$(shell pwd)

	$(MAKE) modules -C $(KERNEL_DIR) SUBDIRS=$(shell pwd) O=$(KERNEL_OUTPUT_DIR)

install:

install:

	install -D -m 644 slamr.ko $(module-dir)/slamr.ko

	install -D -m 644 slamr.ko $(module-dir)/slamr.ko

	install -D -m 644 slusb.ko $(module-dir)/slusb.ko

	install -D -m 644 slusb.ko $(module-dir)/slusb.ko

	/sbin/depmod -a

#	/sbin/depmod -a

uninstall:

uninstall:

	modprobe -r slamr ; echo -n

	modprobe -r slamr ; echo -n

	modprobe -r slusb ; echo -n

	modprobe -r slusb ; echo -n

Lines 114-119	Link Here

endif

endif

endif

endif

dep:

clean:

	$(RM) kernel-ver $(obj-m) $(obj-m:.o=.ko) *st7554.o amrmo_init.o sysdep_amr.o *.mod.* .*.cmd *~

$(obj)/amrlibs.o:

$(obj)/amrlibs.o:

	echo "$@ done"

	echo "$@ done"

.PHONY: install install-modules uninstall-old install-devices remove-devices  all

(-) slmodem-2.9.10.orig/modem/Makefile (-5 / +4 lines)

Lines 16-23	Link Here

CC:= gcc

CC:= gcc

RM:= rm -f

RM:= rm -f

CFLAGS:= -Wall -g -O -I. -DCONFIG_DEBUG_MODEM

EXTRA_CFLAGS+=  -I. -DCONFIG_DEBUG_MODEM

modem-objs:= \

modem-objs:= \

	modem.o modem_datafile.o modem_at.o modem_timer.o \

	modem.o modem_datafile.o modem_at.o modem_timer.o \

Lines 32-44	Link Here

modem_test: modem_test.o modem_cmdline.o $(modem-objs) $(dp-objs) dsplibs.o $(sysdep-objs)

modem_test: modem_test.o modem_cmdline.o $(modem-objs) $(dp-objs) dsplibs.o $(sysdep-objs)

#SUPPORT_ALSA:=1

#SUPPORT_ALSA:=1

ifdef SUPPORT_ALSA

ifeq ($(SUPPORT_ALSA),1)

slmodemd: -lasound

slmodemd: -lasound

CFLAGS+= -DSUPPORT_ALSA=1

EXTRA_CFLAGS+= -DSUPPORT_ALSA=1

endif

endif

slmodemd modem_test:

slmodemd modem_test:

	$(CC) -o $@ $^

	$(CC) $(EXTRA_CFLAGS) -o $@ $^

clean:

clean:

	$(RM) slmodemd modem_test modem_main.o modem_cmdline.o modem_test.o $(modem-objs) $(dp-objs) $(sysdep-objs)

	$(RM) slmodemd modem_test modem_main.o modem_cmdline.o modem_test.o $(modem-objs) $(dp-objs) $(sysdep-objs)

Attachment #40732: files/slmodem-2.9.10-makefile-fixup.patch for bug #65743