diff options
| -rw-r--r-- | Makefile.am | 18 | ||||
| -rw-r--r-- | Makefile.in | 110 | ||||
| -rw-r--r-- | SIN.c | 8 | ||||
| -rw-r--r-- | Skeleton.c | 8 | ||||
| -rwxr-xr-x | configure | 86 | ||||
| -rw-r--r-- | configure.in | 1 |
6 files changed, 185 insertions, 46 deletions
diff --git a/Makefile.am b/Makefile.am index b7a425e..1be1d54 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,6 +4,7 @@ AUTOMAKE_OPTIONS = gnu CLEANFILES = *~ bin_PROGRAMS = lcd4linux +noinst_LIBRARIES = liblcd4linux.a AM_CFLAGS = $(X_CFLAGS) -D_GNU_SOURCE -Wall lcd4linux_LDFLAGS = $(X_LIBS) @@ -51,6 +52,23 @@ Skeleton.c \ XWindow.c \ Text.c +liblcd4linux_a_SOURCES = \ +parport.c parport.h \ +BeckmannEgle.c \ +Crystalfontz.c \ +Cwlinux.c \ +HD44780.c \ +M50530.c \ +T6963.c \ +USBLCD.c \ +MatrixOrbital.c \ +PalmPilot.c \ +Raster.c \ +SIN.c \ +Skeleton.c \ +XWindow.c \ +Text.c + EXTRA_DIST = \ lcd4linux.conf.sample \ lcd4kde.conf \ diff --git a/Makefile.in b/Makefile.in index 572287f..8fe8f6d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -69,12 +69,14 @@ LIB = @LIB@ LTLIB = @LTLIB@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ +RANLIB = @RANLIB@ VERSION = @VERSION@ AUTOMAKE_OPTIONS = gnu CLEANFILES = *~ bin_PROGRAMS = lcd4linux +noinst_LIBRARIES = liblcd4linux.a AM_CFLAGS = $(X_CFLAGS) -D_GNU_SOURCE -Wall lcd4linux_LDFLAGS = $(X_LIBS) @@ -87,13 +89,16 @@ lcd4linux_SOURCES = lcd4linux.c debug.c debug.h cfg.c cfg.h lock.c lock.h pid.c EXTRA_lcd4linux_SOURCES = parport.c parport.h BeckmannEgle.c Crystalfontz.c Cwlinux.c HD44780.c M50530.c T6963.c USBLCD.c MatrixOrbital.c PalmPilot.c Raster.c SIN.c Skeleton.c XWindow.c Text.c +liblcd4linux_a_SOURCES = parport.c parport.h BeckmannEgle.c Crystalfontz.c Cwlinux.c HD44780.c M50530.c T6963.c USBLCD.c MatrixOrbital.c PalmPilot.c Raster.c SIN.c Skeleton.c XWindow.c Text.c + + EXTRA_DIST = lcd4linux.conf.sample lcd4kde.conf lcd4linux.kdelnk lcd4linux.xpm lcd4linux.lsm curses.m4 AUTHORS CREDITS FAQ NEWS TODO README README.Drivers README.KDE ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = -PROGRAMS = $(bin_PROGRAMS) +LIBRARIES = $(noinst_LIBRARIES) DEFS = @DEFS@ -I. -I$(srcdir) -I. @@ -104,6 +109,13 @@ X_CFLAGS = @X_CFLAGS@ X_LIBS = @X_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ +liblcd4linux_a_LIBADD = +liblcd4linux_a_OBJECTS = parport.o BeckmannEgle.o Crystalfontz.o \ +Cwlinux.o HD44780.o M50530.o T6963.o USBLCD.o MatrixOrbital.o \ +PalmPilot.o Raster.o SIN.o Skeleton.o XWindow.o Text.o +AR = ar +PROGRAMS = $(bin_PROGRAMS) + lcd4linux_OBJECTS = lcd4linux.o debug.o cfg.o lock.o pid.o parser.o \ processor.o system.o isdn.o mail.o seti.o battery.o dvb.o filter.o \ udelay.o display.o pixmap.o bar.o fontmap.o exec.o mail2.o socket.o @@ -129,8 +141,8 @@ DEP_FILES = .deps/BeckmannEgle.P .deps/Crystalfontz.P .deps/Cwlinux.P \ .deps/mail.P .deps/mail2.P .deps/parport.P .deps/parser.P .deps/pid.P \ .deps/pixmap.P .deps/processor.P .deps/seti.P .deps/socket.P \ .deps/system.P .deps/udelay.P -SOURCES = $(lcd4linux_SOURCES) $(EXTRA_lcd4linux_SOURCES) -OBJECTS = $(lcd4linux_OBJECTS) +SOURCES = $(liblcd4linux_a_SOURCES) $(lcd4linux_SOURCES) $(EXTRA_lcd4linux_SOURCES) +OBJECTS = $(liblcd4linux_a_OBJECTS) $(lcd4linux_OBJECTS) all: all-redirect .SUFFIXES: @@ -178,6 +190,36 @@ distclean-hdr: maintainer-clean-hdr: +mostlyclean-noinstLIBRARIES: + +clean-noinstLIBRARIES: + -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + +distclean-noinstLIBRARIES: + +maintainer-clean-noinstLIBRARIES: + +.s.o: + $(COMPILE) -c $< + +.S.o: + $(COMPILE) -c $< + +mostlyclean-compile: + -rm -f *.o core *.core + +clean-compile: + +distclean-compile: + -rm -f *.tab.c + +maintainer-clean-compile: + +liblcd4linux.a: $(liblcd4linux_a_OBJECTS) $(liblcd4linux_a_DEPENDENCIES) + -rm -f liblcd4linux.a + $(AR) cru liblcd4linux.a $(liblcd4linux_a_OBJECTS) $(liblcd4linux_a_LIBADD) + $(RANLIB) liblcd4linux.a + mostlyclean-binPROGRAMS: clean-binPROGRAMS: @@ -203,22 +245,6 @@ uninstall-binPROGRAMS: rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done -.s.o: - $(COMPILE) -c $< - -.S.o: - $(COMPILE) -c $< - -mostlyclean-compile: - -rm -f *.o core *.core - -clean-compile: - -distclean-compile: - -rm -f *.tab.c - -maintainer-clean-compile: - lcd4linux: $(lcd4linux_OBJECTS) $(lcd4linux_DEPENDENCIES) @rm -f lcd4linux $(LINK) $(lcd4linux_LDFLAGS) $(lcd4linux_OBJECTS) $(lcd4linux_LDADD) $(LIBS) @@ -359,7 +385,7 @@ install-am: all-am install: install-am uninstall-am: uninstall-binPROGRAMS uninstall: uninstall-am -all-am: Makefile $(PROGRAMS) config.h +all-am: Makefile $(LIBRARIES) $(PROGRAMS) config.h all-redirect: all-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install @@ -377,28 +403,30 @@ distclean-generic: -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-hdr mostlyclean-binPROGRAMS \ - mostlyclean-compile mostlyclean-tags mostlyclean-depend \ - mostlyclean-generic +mostlyclean-am: mostlyclean-hdr mostlyclean-noinstLIBRARIES \ + mostlyclean-compile mostlyclean-binPROGRAMS \ + mostlyclean-tags mostlyclean-depend mostlyclean-generic mostlyclean: mostlyclean-am -clean-am: clean-hdr clean-binPROGRAMS clean-compile clean-tags \ - clean-depend clean-generic mostlyclean-am +clean-am: clean-hdr clean-noinstLIBRARIES clean-compile \ + clean-binPROGRAMS clean-tags clean-depend clean-generic \ + mostlyclean-am clean: clean-am -distclean-am: distclean-hdr distclean-binPROGRAMS distclean-compile \ - distclean-tags distclean-depend distclean-generic \ - clean-am +distclean-am: distclean-hdr distclean-noinstLIBRARIES distclean-compile \ + distclean-binPROGRAMS distclean-tags distclean-depend \ + distclean-generic clean-am distclean: distclean-am -rm -f config.status -maintainer-clean-am: maintainer-clean-hdr maintainer-clean-binPROGRAMS \ - maintainer-clean-compile maintainer-clean-tags \ - maintainer-clean-depend maintainer-clean-generic \ - distclean-am +maintainer-clean-am: maintainer-clean-hdr \ + maintainer-clean-noinstLIBRARIES \ + maintainer-clean-compile maintainer-clean-binPROGRAMS \ + maintainer-clean-tags maintainer-clean-depend \ + maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." @@ -406,15 +434,17 @@ maintainer-clean: maintainer-clean-am -rm -f config.status .PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ -mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \ -maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ +mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \ +clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \ mostlyclean-compile distclean-compile clean-compile \ -maintainer-clean-compile tags mostlyclean-tags distclean-tags \ -clean-tags maintainer-clean-tags distdir mostlyclean-depend \ -distclean-depend clean-depend maintainer-clean-depend info-am info \ -dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \ -install-exec-am install-exec install-data-am install-data install-am \ -install uninstall-am uninstall all-redirect all-am all installdirs \ +maintainer-clean-compile mostlyclean-binPROGRAMS distclean-binPROGRAMS \ +clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \ +install-binPROGRAMS tags mostlyclean-tags distclean-tags clean-tags \ +maintainer-clean-tags distdir mostlyclean-depend distclean-depend \ +clean-depend maintainer-clean-depend info-am info dvi-am dvi check \ +check-am installcheck-am installcheck all-recursive-am install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean @@ -1,4 +1,4 @@ -/* $Id: SIN.c,v 1.9 2003/07/24 04:48:09 reinelt Exp $ +/* $Id: SIN.c,v 1.10 2003/08/17 08:25:30 reinelt Exp $ * * driver for SIN router displays * @@ -20,6 +20,9 @@ * * * $Log: SIN.c,v $ + * Revision 1.10 2003/08/17 08:25:30 reinelt + * preparations for liblcd4linux; minor bugs in SIN.c and Skeleton.c + * * Revision 1.9 2003/07/24 04:48:09 reinelt * 'soft clear' needed for virtual rows * @@ -79,6 +82,7 @@ #include "cfg.h" #include "lock.h" #include "display.h" +#include "bar.h" // FIXME: 6x8 #define XRES 1 @@ -201,7 +205,7 @@ int SIN_init (LCD *Self) // Fixme: should we read the identifier here.... SIN_write ("\033S0", 3); // select screen #0 sleep (1); // FIXME: handshaking - SIN_clear(); + SIN_clear(1); return 0; } @@ -1,4 +1,4 @@ -/* $Id: Skeleton.c,v 1.8 2003/07/24 04:48:09 reinelt Exp $ +/* $Id: Skeleton.c,v 1.9 2003/08/17 08:25:30 reinelt Exp $ * * skeleton driver for new display modules * @@ -20,6 +20,9 @@ * * * $Log: Skeleton.c,v $ + * Revision 1.9 2003/08/17 08:25:30 reinelt + * preparations for liblcd4linux; minor bugs in SIN.c and Skeleton.c + * * Revision 1.8 2003/07/24 04:48:09 reinelt * 'soft clear' needed for virtual rows * @@ -71,6 +74,7 @@ #include "debug.h" #include "cfg.h" #include "display.h" +#include "bar.h" static LCD Lcd; @@ -86,7 +90,7 @@ int Skel_init (LCD *Self) error ("Skeleton: This driver does not drive anything!"); return -1; - Skel_clear(); + Skel_clear(1); return 0; } @@ -310,7 +310,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CURSES_LIBS CURSES_INCLUDEDIR CPP EGREP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS DRIVERS DRVLIBS LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB CURSES_LIBS CURSES_INCLUDEDIR CPP EGREP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS DRIVERS DRVLIBS LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -2458,6 +2458,86 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + +fi +fi +RANLIB=$ac_cv_prog_RANLIB +if test -n "$RANLIB"; then + echo "$as_me:$LINENO: result: $RANLIB" >&5 +echo "${ECHO_T}$RANLIB" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +fi +if test -z "$ac_cv_prog_RANLIB"; then + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_RANLIB="ranlib" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" +fi +fi +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +if test -n "$ac_ct_RANLIB"; then + echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 +echo "${ECHO_T}$ac_ct_RANLIB" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + RANLIB=$ac_ct_RANLIB +else + RANLIB="$ac_cv_prog_RANLIB" +fi + # Checks for libraries. @@ -3227,7 +3307,7 @@ echo "${ECHO_T}Please note that some screen refreshs may fail" >&6 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 ncurses_version=unknown cat > conftest.$ac_ext <<EOF -#line 3230 "configure" +#line 3310 "configure" #include "confdefs.h" #ifdef RENAMED_NCURSES #include <curses.h> @@ -8386,6 +8466,8 @@ s,@CPPFLAGS@,$CPPFLAGS,;t t s,@ac_ct_CC@,$ac_ct_CC,;t t s,@EXEEXT@,$EXEEXT,;t t s,@OBJEXT@,$OBJEXT,;t t +s,@RANLIB@,$RANLIB,;t t +s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t s,@CURSES_LIBS@,$CURSES_LIBS,;t t s,@CURSES_INCLUDEDIR@,$CURSES_INCLUDEDIR,;t t s,@CPP@,$CPP,;t t diff --git a/configure.in b/configure.in index 7b0bd5e..899a8e7 100644 --- a/configure.in +++ b/configure.in @@ -9,6 +9,7 @@ AM_CONFIG_HEADER(config.h) # Checks for programs. AC_PROG_CC +AC_PROG_RANLIB # Checks for libraries. AC_CHECK_LIB(m, log) |