- Fixed some driver build problems (incorrect filenames)
- Some work on the automake/autoconf stuff
This commit is contained in:
+16
-10
@@ -7,13 +7,13 @@ AC_ARG_ENABLE(drivers,
|
||||
[ Possible choices are:]
|
||||
[ mtxorb,cfontz,curses,text,lb216,]
|
||||
[ hd44780,joy,irman,lircin,bayrad,glk,]
|
||||
[ stv5730,sed1330,sed1520,svgalib,lcdm001,t6963]
|
||||
[ stv5730,sed1330,sed1520,svga,lcdm001,t6963]
|
||||
[ \"all\" compiles all drivers],
|
||||
drivers="$enableval",
|
||||
drivers=[lcdm001,mtxorb,cfontz,curses,text,lb216,bayrad,glk])
|
||||
|
||||
if test "$drivers" = "all"; then
|
||||
drivers=[mtxorb,cfontz,curses,text,lb216,hd44780,joy,irman,lirc,bayrad,glk,stv5730,sed1330,sed1520,svgalib,lcdm001,t6963]
|
||||
drivers=[mtxorb,cfontz,curses,text,lb216,hd44780,joy,irman,lirc,bayrad,glk,stv5730,sed1330,sed1520,svga,lcdm001,t6963]
|
||||
fi
|
||||
|
||||
drivers=`echo $drivers | sed 's/,/ /g'`
|
||||
@@ -150,14 +150,20 @@ dnl else
|
||||
DRIVERS="$DRIVERS stv5730${SO}"
|
||||
actdrivers=["$actdrivers stv5730"]
|
||||
;;
|
||||
svgalib)
|
||||
svga)
|
||||
AC_CHECK_LIB(vga, main,
|
||||
LIBSVGA="-lvga -lvgagl"
|
||||
DRIVERS="$DRIVERS svgalib_drv${SO}"
|
||||
actdrivers=["$actdrivers svgalib"]
|
||||
,
|
||||
AC_CHECK_HEADER(ncurses.h,
|
||||
LIBSVGA="-lvga -lvgagl"
|
||||
DRIVERS="$DRIVERS svga${SO}"
|
||||
actdrivers=["$actdrivers svga"]
|
||||
,
|
||||
dnl else
|
||||
AC_MSG_WARN([The svgalib driver needs the vga library]))
|
||||
AC_MSG_WARN([Could not find vga.h and/or vgagl.h]),
|
||||
)
|
||||
,
|
||||
dnl else
|
||||
AC_MSG_WARN([The svga driver needs the vga library])
|
||||
)
|
||||
;;
|
||||
t6963)
|
||||
DRIVERS="$DRIVERS t6963${SO}"
|
||||
@@ -470,7 +476,7 @@ AC_MSG_CHECKING(module extension)
|
||||
case $host in
|
||||
hp*|HP*)
|
||||
SO=.sl;;
|
||||
cygwin*)
|
||||
*cygwin*)
|
||||
SO=.dll;;
|
||||
*)
|
||||
SO=.so;;
|
||||
@@ -502,7 +508,7 @@ case "$host" in
|
||||
fi
|
||||
LDSHARED="-b"
|
||||
;;
|
||||
CYGWIN*)
|
||||
*cygwin*)
|
||||
CCSHARED="-DUSE_DL_IMPORT"
|
||||
LDSHARED="-shared -Wl,--enable-auto-image-base"
|
||||
;;
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
##
|
||||
|
||||
pkglib_PROGRAMS = @DRIVERS@
|
||||
EXTRA_PROGRAMS = bayrad.!SO! CFontz.!SO! curses_drv.!SO! glk.!SO! hd44780.!SO! irman.!SO! joy.!SO! lb216.!SO! lcdm001.!SO! lirc.!SO! MtxOrb.!SO! sed1330.!SO! sed1520.!SO! stv5730.!SO! svga.!SO! t6963.!SO! text.!SO! wirz_sli.!SO!
|
||||
EXTRA_PROGRAMS = bayrad.!SO! CFontz.!SO! curses.!SO! glk.!SO! hd44780.!SO! irman.!SO! joy.!SO! lb216.!SO! lcdm001.!SO! lirc.!SO! MtxOrb.!SO! sed1330.!SO! sed1520.!SO! stv5730.!SO! svga.!SO! t6963.!SO! text.!SO! wirz_sli.!SO!
|
||||
noinst_LIBRARIES = libLCD.a
|
||||
|
||||
EXTRA_DIST = Makefile.am.pre
|
||||
@@ -19,10 +19,13 @@ CCFLAGS += @CCSHARED@
|
||||
LDFLAGS += @LDSHARED@
|
||||
|
||||
## Forget the libs that the server core requires
|
||||
LIBS=
|
||||
LIBS =
|
||||
|
||||
## Forget automake's EXEEXT variable that will determine the executable's extension
|
||||
EXEEXT =
|
||||
|
||||
CFontz_!SO!_LDADD = libLCD.a
|
||||
curses_drv_!SO!_LDADD = @LIBCURSES@
|
||||
curses_!SO!_LDADD = @LIBCURSES@
|
||||
hd44780_!SO!_LDADD = libLCD.a
|
||||
irman_!SO!_LDADD = @LIBIRMAN@
|
||||
lirc_!SO!_LDADD = @LIBLIRC_CLIENT@
|
||||
@@ -33,7 +36,7 @@ libLCD_a_SOURCES = lcd_lib.h lcd_lib.c
|
||||
|
||||
bayrad_!SO!_SOURCES = lcd.h bayrad.h bayrad.c report.h
|
||||
CFontz_!SO!_SOURCES = lcd.h CFontz.c CFontz.h report.h
|
||||
curses_drv_!SO!_SOURCES = lcd.h curses_drv.h curses_drv.c report.h
|
||||
curses_!SO!_SOURCES = lcd.h curses_drv.h curses_drv.c report.h
|
||||
glk_!SO!_SOURCES = lcd.h glk.c glk.h glkproto.c glkproto.h report.h
|
||||
hd44780_!SO!_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
|
||||
irman_!SO!_SOURCES = lcd.h irmanin.c irmanin.h report.h
|
||||
|
||||
Reference in New Issue
Block a user