Merge branch 'upstream' into maemo

[navit-package] / navit / xpm / Makefile.am

diff --git a/navit/xpm/Makefile.am b/navit/xpm/Makefile.am
index 9022344..7695cd7 100644 (file)
--- a/navit/xpm/Makefile.am
+++ b/navit/xpm/Makefile.am
@@ -31,6 +31,7 @@ xpm_DATA += information.xpm
 xpm_DATA += justice.xpm
 xpm_DATA += level_crossing.xpm
 xpm_DATA += library.xpm
+xpm_DATA += mark.xpm
 xpm_DATA += mini_roundabout.xpm
 xpm_DATA += memorial.xpm
 xpm_DATA += military.xpm
@@ -67,7 +68,8 @@ xpm_DATA += menu.xpm
 xpm_DATA += school.xpm
 xpm_DATA += public_office.xpm
 
-svgs  = gui_actions.svg
+svgs  = gui_about.svg
+svgs += gui_actions.svg
 svgs += gui_active.svg
 svgs += gui_bookmark.svg
 svgs += gui_display.svg
@@ -83,6 +85,7 @@ svgs += gui_sound_off.svg
 svgs += gui_tools.svg
 svgs += gui_fullscreen.svg
 svgs += gui_leave_fullscreen.svg
+svgs += mark.svg
 svgs += gui_quit.svg gui_stop.svg
 svgs += gui_town.svg
 svgs += gui_vehicle.svg
@@ -194,26 +197,31 @@ xsize = $(word 1,$(subst x, ,$(scale)))
 ysize = $(word $(words $(scale)),$(subst x, ,$(scale)))
 comma =,
 
+# png images of the user interface and other, sizes e.g. "8,16,32,48,96"
 if USE_SVG2PNG_SCALES
 pngs += $(foreach scale, $(subst $(comma), ,@SVG2PNG_SCALES@), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(svgs))))
 endif
+# png state flags
 if USE_SVG2PNG_SCALES_FLAG
 pngs += $(foreach scale, $(subst $(comma), ,@SVG2PNG_SCALES_FLAG@), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(flag_svgs))))
 endif
+# png symbols for navigation
 if USE_SVG2PNG_SCALES_NAV
 pngs += $(foreach scale, $(subst $(comma), ,@SVG2PNG_SCALES_NAV@), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(nav_svgs))))
 endif
 xpm_DATA += $(pngs)
 endif
 
-DESKTOPFILEdir=$(datadir)/applications
-DESKTOPFILE_DATA = desktop_icons/navit.desktop
+if !SUPPORT_WIN32
+  DESKTOPFILEdir=$(datadir)/applications
+  DESKTOPFILE_DATA = desktop_icons/navit.desktop
 
-ICON128dir=$(datadir)/icons/hicolor/128x128/apps
-ICON128_DATA = desktop_icons/128x128/navit.png
+  ICON128dir=$(datadir)/icons/hicolor/128x128/apps
+  ICON128_DATA = desktop_icons/128x128/navit.png
 
-ICON22dir=$(datadir)/icons/hicolor/22x22/apps
-ICON22_DATA = desktop_icons/22x22/navit.png
+  ICON22dir=$(datadir)/icons/hicolor/22x22/apps
+  ICON22_DATA = desktop_icons/22x22/navit.png
+endif
 
 EXTRA_DIST = $(xpm_DATA) $(DESKTOPFILE_DATA) $(ICON128_DATA) $(ICON22_DATA) navit_svg2png
 #burgerking.ico: