From a8143ad039720283f161b3033b7b484f0a57becc Mon Sep 17 00:00:00 2001 From: robijn Date: Fri, 10 May 2002 18:05:50 +0000 Subject: [PATCH] Adapted autoconf/make system to deselect parallel port HD44780 subdrivers if there is no controlleable LPT port. --- acinclude.m4 | 6 ++++-- server/drivers/Makefile.am | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 139cf72..166ccd1 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -120,10 +120,11 @@ dnl else ;; hd44780) if test "$ac_cv_port_have_lpt" = yes ; then - DRIVERS="$DRIVERS hd44780.o hd44780-4bit.o hd44780-ext8bit.o lcd_sem.o hd44780-serialLpt.o hd44780-winamp.o hd44780-picanlcd.o" + HD44780_DRIVERS="hd44780-4bit.o hd44780-ext8bit.o lcd_sem.o hd44780-serialLpt.o hd44780-picanlcd.o" else - DRIVERS="$DRIVERS hd44780.o hd44780-picanlcd.o" + HD44780_DRIVERS="hd44780-picanlcd.o" fi + DRIVERS="$DRIVERS hd44780${SO}" actdrivers=["$actdrivers hd44780"] ;; joy) @@ -220,6 +221,7 @@ AC_SUBST(LIBIRMAN) AC_SUBST(LIBLIRC_CLIENT) AC_SUBST(LIBSVGA) AC_SUBST(DRIVERS) +AC_SUBST(HD44780_DRIVERS) ]) diff --git a/server/drivers/Makefile.am b/server/drivers/Makefile.am index 0fbdb92..13858d1 100644 --- a/server/drivers/Makefile.am +++ b/server/drivers/Makefile.am @@ -24,7 +24,8 @@ noinst_LIBRARIES = libLCD.a CFontz_LDADD = libLCD.a CFontz633_LDADD = libLCD.a curses_LDADD = @LIBCURSES@ -hd44780_LDADD = libLCD.a +hd44780_LDADD = libLCD.a @HD44780_DRIVERS@ +hd44780_DEPENDENCIES = @HD44780_DRIVERS@ icp_a106_LDADD = libLCD.a irman_LDADD = @LIBIRMAN@ lirc_LDADD = @LIBLIRC_CLIENT@ @@ -39,7 +40,9 @@ CFontz_SOURCES = lcd.h CFontz.c CFontz.h report.h CFontz633_SOURCES = lcd.h CFontz633.c CFontz633.h CFontz633io.c CFontz633io.h report.h curses_SOURCES = lcd.h curses_drv.h curses_drv.c report.h glk_SOURCES = lcd.h glk.c glk.h glkproto.c glkproto.h report.h -hd44780_SOURCES = lcd.h hd44780.h hd44780.c hd44780-drivers.h hd44780-low.h hd44780-charmap.h hd44780-4bit.c hd44780-4bit.h hd44780-ext8bit.c hd44780-ext8bit.h lcd_sem.c lcd_sem.h hd44780-serialLpt.c hd44780-serialLpt.h hd44780-winamp.c hd44780-winamp.h hd44780-picanlcd.c hd44780-picanlcd.h port.h lpt-port.h timing.h report.h +hd44780_SOURCES = lcd.h hd44780.h hd44780.c hd44780-drivers.h hd44780-low.h hd44780-charmap.h report.h +EXTRA_hd44780_SOURCES = hd44780-4bit.c hd44780-4bit.h hd44780-ext8bit.c hd44780-ext8bit.h lcd_sem.c lcd_sem.h hd44780-serialLpt.c hd44780-serialLpt.h hd44780-winamp.c hd44780-winamp.h hd44780-picanlcd.c hd44780-picanlcd.h port.h lpt-port.h timing.h + icp_a106_SOURCES = lcd.h icp_a106.c icp_a106.h report.h irman_SOURCES = lcd.h irmanin.c irmanin.h report.h joy_SOURCES = lcd.h joy.c joy.h port.h report.h