Fix:Build:Fixed some errors

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk/navit@2496 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/Makefile.am b/navit/Makefile.am
index 5fa5192..20d2b2a 100644 (file)
--- a/navit/Makefile.am
+++ b/navit/Makefile.am
@@ -42,11 +42,12 @@ libnavit_la_SOURCES = announcement.c atom.c attr.c cache.c callback.c command.c
        navit_nls.h
 
 comma=,
-navit.xml: navit_shipped.xml  $(foreach xslt, $(subst $(comma), ,@XSLTS@), $(addsuffix .xslt,$(addprefix xslt/,$(xslt))))
+XSLTS=@XSLTS@
+navit.xml: navit_shipped.xml  $(foreach xslt, $(subst $(comma), ,$(XSLTS)), $(addsuffix .xslt,$(addprefix xslt/,$(xslt))))
        cp $< navit.xml.tmp
        cp $< navit.xml.new
        if [ "$(builddir)" != "$(srcdir)" ]; then cp $(srcdir)/navit.dtd $(builddir)/navit.dtd; fi
-       for i in $^; do if [ "$${i%.xslt}" != "$$i" ]; then saxon -snone navit.xml.tmp $$i >navit.xml.new || exit ; fi ; done
+       for i in $^; do if [ "$${i%.xslt}" != "$$i" ]; then echo "Applying $$i" ; saxon -snone navit.xml.tmp $$i >navit.xml.new || exit ; fi ; done
        mv navit.xml.new navit.xml
        
 

diff --git a/navit/xslt/android.xslt b/navit/xslt/android.xslt
index 0fccb7d..c35647c 100644 (file)
--- a/navit/xslt/android.xslt
+++ b/navit/xslt/android.xslt
@@ -4,33 +4,19 @@
        <xsl:include href="default_plugins.xslt"/>
        <xsl:include href="gui_internal.xslt"/>
        <xsl:include href="map_sdcard_navitmap_bin.xslt"/>
+       <xsl:include href="osd_minimum.xslt"/>
         <xsl:template match="/config/plugins/plugin[1]" priority="100">
                <plugin path="$NAVIT_PREFIX/lib/libgraphics_android.so" ondemand="no"/>
                <xsl:text>&#x0A;        </xsl:text>
                <plugin path="$NAVIT_PREFIX/lib/libvehicle_android.so" ondemand="no"/>
                <xsl:text>&#x0A;        </xsl:text>
-               <plugin path="$NAVIT_PREFIX/lib/libspeech_android.so" enabled="yes" ondemand="no"/>
+               <plugin path="$NAVIT_PREFIX/lib/libspeech_android.so" ondemand="no"/>
                <xsl:text>&#x0A;        </xsl:text>
                <xsl:next-match/>
         </xsl:template>
         <xsl:template match="/config/navit/graphics">
                 <graphics type="android" />
         </xsl:template>
-        <xsl:template match="/config/navit/osd[1]">
-               <osd type="compass" enabled="yes" x="-60" y="-80"/>
-               <xsl:text>&#x0A;        </xsl:text>
-               <osd type="text" label="${{navigation.item.destination_length[named]}}\n${{navigation.item.destination_time[arrival]}}" x="-60" y="0" w="60" h="40"/>
-               <xsl:text>&#x0A;        </xsl:text>
-               <osd type="navigation_next_turn" x="0" y="-60" w="60" h="40" icon_src="%s_wh_44_44.png"/>
-               <xsl:text>&#x0A;        </xsl:text>
-               <osd type="text" label="${{navigation.item[1].length[named]}}" x="0" y="-20"/>
-               <xsl:text>&#x0A;        </xsl:text>
-               <osd type="button" src="gui_zoom_in_64_64.png" command="zoom_in()" x="0" y="0"/>
-               <xsl:text>&#x0A;        </xsl:text>
-               <osd type="button" src="gui_zoom_out_64_64.png" command="zoom_out()" x="0" y="70"/>
-               <xsl:text>&#x0A;        </xsl:text>
-                <xsl:copy><xsl:copy-of select="@*|node()"/></xsl:copy>
-        </xsl:template>
         <xsl:template match="/config/navit/vehicle[1]">
                 <xsl:copy><xsl:copy-of select="@*[not(name()='gpsd_query')]"/>
                        <xsl:attribute name="source">android:</xsl:attribute>

diff --git a/navit/xslt/default_plugins.xslt b/navit/xslt/default_plugins.xslt
index 43da940..0d3227c 100644 (file)
--- a/navit/xslt/default_plugins.xslt
+++ b/navit/xslt/default_plugins.xslt
@@ -9,4 +9,5 @@
                <xsl:text>&#x0A;        </xsl:text>
                <plugin path="$NAVIT_PREFIX/lib/libosd_core.so" ondemand="no"/>
         </xsl:template>
+        <xsl:template match="/config/plugins/plugin"/>
 </xsl:transform>

diff --git a/navit/xslt/osd_minimum.xslt b/navit/xslt/osd_minimum.xslt
new file mode 100644 (file)
index 0000000..38b2665
--- /dev/null
+++ b/navit/xslt/osd_minimum.xslt
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<xsl:transform version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xi="http://www.w3.org/2001/XInclude">
+        <xsl:template match="/config/navit/osd[1]">
+               <osd type="compass" enabled="yes" x="-60" y="-80"/>
+               <xsl:text>&#x0A;        </xsl:text>
+               <osd type="text" label="${{navigation.item.destination_length[named]}}\n${{navigation.item.destination_time[arrival]}}" x="-60" y="0" w="60" h="40"/>
+               <xsl:text>&#x0A;        </xsl:text>
+               <osd type="navigation_next_turn" x="0" y="-60" w="60" h="40" icon_src="%s_wh_44_44.png"/>
+               <xsl:text>&#x0A;        </xsl:text>
+               <osd type="text" label="${{navigation.item[1].length[named]}}" x="0" y="-20"/>
+               <xsl:text>&#x0A;        </xsl:text>
+               <osd type="button" src="gui_zoom_in_64_64.png" command="zoom_in()" x="0" y="0"/>
+               <xsl:text>&#x0A;        </xsl:text>
+               <osd type="button" src="gui_zoom_out_64_64.png" command="zoom_out()" x="0" y="70"/>
+               <xsl:text>&#x0A;        </xsl:text>
+                <xsl:copy><xsl:copy-of select="@*|node()"/></xsl:copy>
+        </xsl:template>
+</xsl:transform>