Hi again, Amaya
Please take a look at the attached patch to lirc-modules-source Makefile. It
applies to lirc (0.7.1pre2-6).
It has some important changes with respect to the previous one:
#303663 [lirc_sir.ko cannot be loaded, unknown symbols]
#304609 [Does not build when two drivers requiring lirc_dev are selected]
- lirc_dev target renamed to dev for consistency with the other targets
having the dir name stripped of lirc_. Target dependencies adapted for
this.
- Adding lirc_it87 lirc_bt829 lirc_atiusb to the clean target
- Includes a proposed fix for #303663, as previous patch did.
#300989 [Does not Build the atiusb driver properly]
* This bug is tagged as fixed, but I think should be reopened. Seems that
there were errors when applying #300989 patch and there is some rubbish
flying around in the Makefile, and some things only partially changed.
I also have not clear why a double colon is used in the atiusb target,
since no other similar target seems there. Removed the double colon,
removed the rubbish, and changed as appropriate, adding lirc_atiusb to
the clean target.
and a couple of cosmetic changes. I could only check that builds, but do not
have any lirc device here, so I could not make sure that the result really
works.
By the way seems that atiusb is not offered at the debconf prompt, is that
intentional?
Saludos,
--
Agustin
diff -Naur lirc-0.7.1pre2.amaya/debian/modules-source/Makefile
lirc-0.7.1pre2/debian/modules-source/Makefile
--- lirc-0.7.1pre2.amaya/debian/modules-source/Makefile 2005-04-15
12:41:28.768676000 +0200
+++ lirc-0.7.1pre2/debian/modules-source/Makefile 2005-04-15
12:43:20.581678184 +0200
@@ -83,50 +83,39 @@
exit 1;\
fi
- atiusb:: modules sanity-check
- - mv drivers/atiusb_i2c/lirc_atiusb.$(KEXT) modules
- - @echo $(KVERS) $(KSRC) > modules/lirc_i2c.$(KEXT).KVERS
- + mv drivers/lirc_atiusb/lirc_atiusb.$(KEXT) modules
- + @echo $(KVERS) $(KSRC) > modules/lirc_atiusb.$(KEXT).KVERS
-
-atiusb:: modules sanity-check
- $(MAKE) -e -C drivers SUBDIRS="lirc_atiusb lirc_dev"
+dev: modules sanity-check
+ $(MAKE) -e -C drivers SUBDIRS="lirc_dev"
mv drivers/lirc_dev/lirc_dev.$(KEXT) modules
- mv drivers/atiusb_dev/lirc_dev.$(KEXT) modules
@echo $(KVERS) $(KSRC) > modules/lirc_dev.$(KEXT).KVERS
- mv drivers/atiusb_i2c/lirc_atiusb.$(KEXT) modules
+
+atiusb: modules sanity-check dev
+ $(MAKE) -e -C drivers SUBDIRS="lirc_atiusb"
+ mv drivers/lirc_atiusb/lirc_atiusb.$(KEXT) modules
@echo $(KVERS) $(KSRC) > modules/lirc_atiusb.$(KEXT).KVERS
-i2c: modules sanity-check
- $(MAKE) -e -C drivers SUBDIRS="lirc_i2c lirc_dev"
- mv drivers/lirc_dev/lirc_dev.$(KEXT) modules
- @echo $(KVERS) $(KSRC) > modules/lirc_dev.$(KEXT).KVERS
+i2c: modules sanity-check dev
+ $(MAKE) -e -C drivers SUBDIRS="lirc_i2c"
mv drivers/lirc_i2c/lirc_i2c.$(KEXT) modules
@echo $(KVERS) $(KSRC) > modules/lirc_i2c.$(KEXT).KVERS
-gpio: modules sanity-check
- $(MAKE) -e -C drivers SUBDIRS="lirc_gpio lirc_dev"
- mv drivers/lirc_dev/lirc_dev.$(KEXT) modules
- @echo $(KVERS) $(KSRC) > modules/lirc_dev.$(KEXT).KVERS
+gpio: modules sanity-check dev
+ $(MAKE) -e -C drivers SUBDIRS="lirc_gpio"
mv drivers/lirc_gpio/lirc_gpio.$(KEXT) modules
@echo $(KVERS) $(KSRC) > modules/lirc_gpio.$(KEXT).KVERS
it87: modules sanity-check
$(MAKE) -e -C drivers SUBDIRS="lirc_it87"
- @echo $(KVERS) $(KSRC) > modules/lirc_it87.o.KVERS
mv drivers/lirc_it87/lirc_it87.$(KEXT) modules
@echo $(KVERS) $(KSRC) > modules/lirc_it87.$(KEXT).KVERS
-
+
bt829: modules sanity-check
$(MAKE) -e -C drivers SUBDIRS="lirc_bt829"
mv drivers/lirc_bt829/lirc_bt829.$(KEXT) modules
@echo $(KVERS) $(KSRC) > modules/lirc_bt829.$(KEXT).KVERS
-
+
serial: DEFS += $(SERIAL_CFLAGS)
-serial: modules sanity-check
- $(MAKE) -C drivers SUBDIRS="lirc_serial lirc_dev" DEFS="$(DEFS)"
- mv drivers/lirc_dev/lirc_dev.$(KEXT) modules
- @echo $(KVERS) $(KSRC) > modules/lirc_dev.$(KEXT).KVERS
+serial: modules sanity-check dev
+ $(MAKE) -C drivers SUBDIRS="lirc_serial" DEFS="$(DEFS)"
mv drivers/lirc_serial/lirc_serial.$(KEXT) modules
@echo $(KVERS) $(KSRC) > modules/lirc_serial.$(KEXT).KVERS
@@ -137,11 +126,11 @@
@echo $(KVERS) $(KSRC) > modules/lirc_parallel.$(KEXT).KVERS
sir: DEFS += $(SIR_CFLAGS)
-sir: modules sanity-check
+sir: modules sanity-check dev
$(MAKE) -C drivers SUBDIRS="lirc_sir" DEFS="$(DEFS)"
mv drivers/lirc_sir/lirc_sir.$(KEXT) modules
@echo $(KVERS) $(KSRC) > modules/lirc_sir.$(KEXT).KVERS
-
+
install:
@for file in modules/*.$(KEXT); \
do \
@@ -169,5 +158,5 @@
done
clean:
- $(MAKE) clean -C drivers SUBDIRS="lirc_serial lirc_parallel lirc_i2c
lirc_sir lirc_dev lirc_gpio"
+ $(MAKE) clean -C drivers SUBDIRS="lirc_serial lirc_parallel lirc_i2c
lirc_sir lirc_dev lirc_gpio lirc_it87 lirc_bt829 lirc_atiusb"
rm -rf modules
