cleanup & cosmetics

git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@911 3ae390bd-cb1e-0410-b409-cd5a39f66f1f

diff --git a/Makefile.in b/Makefile.in
index 26d0aee2a45409bd9e5756c755c1e9531d82deeb..95d433ae982339499bd8d8e4e4a422ed43b8d161 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -288,7 +288,8 @@ drv_MatrixOrbital.c           \
 drv_MilfordInstruments.c      \
 drv_Noritake.c                \
 drv_NULL.c                    \
-drv_Pertelian                 \
+drv_Pertelian.c               \
+drv_PHAnderson.c              \
 drv_picoLCD.c                 \
 drv_picoLCDGraphic.c          \
 drv_RouterBoard.c             \
@@ -475,6 +476,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_MilfordInstruments.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_NULL.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_Noritake.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_PHAnderson.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_Pertelian.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_RouterBoard.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_Sample.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_SimpleLCD.Po@am__quote@

diff --git a/config.h.in b/config.h.in
index a8e7c57168c3037071055d8947b427ab274b4cfd..67be1e8e408391a53317835e2b1e307bd7a0849c 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -488,6 +488,9 @@
 /* Pertelian driver */
 #undef WITH_PERTELIAN
 
+/* PHAnderson driver */
+#undef WITH_PHANDERSON
+
 /* picoLCD driver */
 #undef WITH_PICOLCD
 

diff --git a/configure b/configure
index b8b0fb23ab7bfdd7b151b015ab9356c232a37281..bcc5ec919dfdb6778e81228553c19739aa7f5160 100755 (executable)
--- a/configure
+++ b/configure
@@ -1342,10 +1342,10 @@ Optional Packages:
                           drivers may be excluded with 'all,!<driver>',
                           (try 'all,\!<driver>' if your shell complains...)
                           possible drivers are:
-                          BeckmannEgle, BWCT, CrystalFontz, Curses, Cwlinux, D4D
+                          BeckmannEgle, BWCT, CrystalFontz, Curses, Cwlinux, D4D,
                           G15, HD44780, IRLCD, LCD2USB LCDLinux, LCDTerm, LPH7508,
-                          LUIse, M50530, MatrixOrbital, MilfordInstruments,
-                          Noritake, NULL, PNG, PPM, Pertelian, picoLCD, picoLCDGraphic,
+                          LUIse, M50530, MatrixOrbital, MilfordInstruments, Noritake,
+                          NULL, PNG, PPM, Pertelian, PHAnderson, picoLCD, picoLCDGraphic,
                           RouterBoard, Sample, serdisplib, SimpleLCD, st2205, T6963, Trefon,
                           ULA200, USBLCD, USBHUB, WincorNixdorf, X11
   --with-plugins=<list>   choose which plugins to compile.
@@ -7706,6 +7706,7 @@ for driver in $drivers; do
          NORITAKE="yes"
          NULL="yes"
          PERTELIAN="yes"
+         PHANDERSON="yes"
          PICOLCD="yes"
         PICOLCDGRAPHIC="yes"
          PNG="yes"
@@ -7792,6 +7793,9 @@ for driver in $drivers; do
       Pertelian)
          PERTELIAN=$val
          ;;
+      PHAnderson)
+         PHANDERSON=$val
+         ;;
       picoLCD)
          PICOLCD=$val
          ;;
@@ -8176,7 +8180,16 @@ _ACEOF
 
 fi
 
+if test "$PHANDERSON" = "yes"; then
+   TEXT="yes"
+   SERIAL="yes"
+   DRIVERS="$DRIVERS drv_PHAnderson.o"
 
+cat >>confdefs.h <<\_ACEOF
+#define WITH_PHANDERSON 1
+_ACEOF
+
+fi
 
 if test "$PICOLCD" = "yes"; then
    if test "$has_usb" = "true"; then
@@ -8592,9 +8605,9 @@ echo "$as_me: error: run ./configure --with-plugins=..." >&2;}
       apm)
          PLUGIN_APM=$val
          ;;
-                       button_exec)
-                          PLUGIN_BUTTON_EXEC=$val
-                                ;;
+      button_exec)
+        PLUGIN_BUTTON_EXEC=$val
+        ;;
       asterisk)
          PLUGIN_ASTERISK=$val
          ;;
@@ -10965,11 +10978,6 @@ _ACEOF
 
 fi
 
-#if test "$PLUGIN_" = "yes"; then
-#   PLUGINS="$PLUGINS plugin_.o"
-#   AC_DEFINE(PLUGIN_,1,[plugin])
-#fi
-
 if test "$PLUGINS" = ""; then
    { { echo "$as_me:$LINENO: error: You should include at least one plugin..." >&5
 echo "$as_me: error: You should include at least one plugin..." >&2;}

diff --git a/plugins.m4 b/plugins.m4
index 417c894df79517d40153b5db346c53cdb9b09adf..727c4b3849c1e8b3e49193a66cbe0d502a005ee9 100644 (file)
--- a/plugins.m4
+++ b/plugins.m4
@@ -90,9 +90,9 @@ for plugin in $plugins; do
       apm)
          PLUGIN_APM=$val
          ;;
-                       button_exec)
-                          PLUGIN_BUTTON_EXEC=$val
-                                ;;
+      button_exec)
+        PLUGIN_BUTTON_EXEC=$val
+        ;;
       asterisk)
          PLUGIN_ASTERISK=$val
          ;;
@@ -386,11 +386,6 @@ if test "$PLUGIN_XMMS" = "yes"; then
    AC_DEFINE(PLUGIN_XMMS,1,[xmms plugin])
 fi
 
-#if test "$PLUGIN_" = "yes"; then
-#   PLUGINS="$PLUGINS plugin_.o"
-#   AC_DEFINE(PLUGIN_,1,[plugin])
-#fi
-
 if test "$PLUGINS" = ""; then
    AC_MSG_ERROR([You should include at least one plugin...])
 #else

diff --git a/smoketest.sh b/smoketest.sh
index 4a89f2e0156ae8db27ca1aab151940262af11820..02c1170ddc1d2b9d2bcec5d82ab1e35fb82b2498 100755 (executable)
--- a/smoketest.sh
+++ b/smoketest.sh
@@ -9,11 +9,11 @@ rm -f smoketest.log lcd4linux
 make distclean
 ./bootstrap
 
-for driver in BeckmannEgle BWCT CrystalFontz Curses Cwlinux D4D EA232graphic G15 HD44780 IRLCD LCD2USB LCDLinux LCDTerm LEDMatrix LPH7508 LUIse M50530 MatrixOrbital MilfordInstruments Noritake NULL Pertelian picoLCD picoLCDGraphic PNG PPM RouterBoard Sample serdisplib SimpleLCD T6963 Trefon ULA200 USBHUB USBLCD WincorNixdorf X11; do
+for driver in BeckmannEgle BWCT CrystalFontz Curses Cwlinux D4D EA232graphic G15 HD44780 IRLCD LCD2USB LCDLinux LCDTerm LEDMatrix LPH7508 LUIse M50530 MatrixOrbital MilfordInstruments Noritake NULL Pertelian PHAnderson picoLCD picoLCDGraphic PNG PPM RouterBoard Sample serdisplib SimpleLCD T6963 Trefon ULA200 USBHUB USBLCD WincorNixdorf X11; do
 
     make distclean
     ./configure --with-drivers=$driver
-    make -j 2
+    make -s -j 2
     
     if [ -x lcd4linux ]; then
        echo "Success: $driver" >>smoketest.log