]> git.street.me.uk Git - andy/viking.git/blobdiff - src/icons/Makefile.am
Refactor: update OSM track upload
[andy/viking.git] / src / icons / Makefile.am
index aa5b531c4b7566b685d93ce433b24c938c63982b..231184bd144567db2d82621bc13e22b1833bb188 100644 (file)
@@ -1,85 +1,85 @@
 WAYPOINT_ICONS = \
-  wp_camp.png \
-  wp_car.png \
-  wp_deer.png \
-  wp_flag.png \
-  wp_geocache.png \
-  wp_geocache_fnd.png \
-  wp_house.png \
-  wp_wpt_dot.png \
-  wp_dollar.png \
-  wp_golf.png \
-  wp_summit.png \
-  wp_anchor.png \
-  wp_forest.png \
-  wp_parking.png \
-  wp_sml_cty.png \
-  wp_med_cty.png \
-  wp_lrg_cty.png \
-  wp_cap_cty.png \
-  wp_bell.png \
-  wp_diamond_grn.png \
-  wp_diamond_red.png \
-  wp_dive1.png \
-  wp_dive2.png \
-  wp_fish.png \
-  wp_fuel.png \
-  wp_horn.png \
-  wp_knife.png \
-  wp_light.png \
-  wp_mug.png \
-  wp_skull.png \
-  wp_square_grn.png \
-  wp_square_red.png \
-  wp_wbuoy.png \
-  wp_wreck.png \
-  wp_null.png \
-  wp_mine.png \
-  wp_school.png \
-  wp_cemetery.png \
-  wp_church.png \
-  wp_military.png \
-  wp_mob.png \
-  wp_buoy_ambr.png \
-  wp_buoy_blck.png \
-  wp_buoy_blue.png \
-  wp_buoy_grn.png \
-  wp_buoy_grn_red.png \
-  wp_buoy_grn_wht.png \
-  wp_buoy_orng.png \
-  wp_buoy_red.png \
-  wp_buoy_red_grn.png \
-  wp_buoy_red_wht.png \
-  wp_buoy_violet.png \
-  wp_buoy_wht.png \
-  wp_buoy_wht_grn.png \
-  wp_buoy_wht_red.png \
-  wp_dot.png \
-  wp_rbcn.png \
-  wp_boat_ramp.png \
-  wp_restroom.png \
-  wp_shower.png \
-  wp_drinking_wtr.png \
-  wp_phone.png \
-  wp_1st_aid.png \
-  wp_info.png \
-  wp_park.png \
-  wp_picnic.png \
-  wp_scenic.png \
-  wp_skiing.png \
-  wp_swimming.png \
-  wp_dam.png \
-  wp_controlled.png \
-  wp_danger.png \
-  wp_restricted.png \
-  wp_ball.png \
-  wp_rv_park.png \
-  wp_bridge.png \
-  wp_building.png \
-  wp_tunnel.png \
-  wp_beach.png \
-  wp_airplane.png \
-  wp_ice_skating.png
+       wp_camp.png \
+       wp_car.png \
+       wp_deer.png \
+       wp_flag.png \
+       wp_geocache.png \
+       wp_geocache_fnd.png \
+       wp_house.png \
+       wp_wpt_dot.png \
+       wp_dollar.png \
+       wp_golf.png \
+       wp_summit.png \
+       wp_anchor.png \
+       wp_forest.png \
+       wp_parking.png \
+       wp_sml_cty.png \
+       wp_med_cty.png \
+       wp_lrg_cty.png \
+       wp_cap_cty.png \
+       wp_bell.png \
+       wp_diamond_grn.png \
+       wp_diamond_red.png \
+       wp_dive1.png \
+       wp_dive2.png \
+       wp_fish.png \
+       wp_fuel.png \
+       wp_horn.png \
+       wp_knife.png \
+       wp_light.png \
+       wp_mug.png \
+       wp_skull.png \
+       wp_square_grn.png \
+       wp_square_red.png \
+       wp_wbuoy.png \
+       wp_wreck.png \
+       wp_null.png \
+       wp_mine.png \
+       wp_school.png \
+       wp_cemetery.png \
+       wp_church.png \
+       wp_military.png \
+       wp_mob.png \
+       wp_buoy_ambr.png \
+       wp_buoy_blck.png \
+       wp_buoy_blue.png \
+       wp_buoy_grn.png \
+       wp_buoy_grn_red.png \
+       wp_buoy_grn_wht.png \
+       wp_buoy_orng.png \
+       wp_buoy_red.png \
+       wp_buoy_red_grn.png \
+       wp_buoy_red_wht.png \
+       wp_buoy_violet.png \
+       wp_buoy_wht.png \
+       wp_buoy_wht_grn.png \
+       wp_buoy_wht_red.png \
+       wp_dot.png \
+       wp_rbcn.png \
+       wp_boat_ramp.png \
+       wp_restroom.png \
+       wp_shower.png \
+       wp_drinking_wtr.png \
+       wp_phone.png \
+       wp_1st_aid.png \
+       wp_info.png \
+       wp_park.png \
+       wp_picnic.png \
+       wp_scenic.png \
+       wp_skiing.png \
+       wp_swimming.png \
+       wp_dam.png \
+       wp_controlled.png \
+       wp_danger.png \
+       wp_restricted.png \
+       wp_ball.png \
+       wp_rv_park.png \
+       wp_bridge.png \
+       wp_building.png \
+       wp_tunnel.png \
+       wp_beach.png \
+       wp_airplane.png \
+       wp_ice_skating.png
 
 WAYPOINT_ICONS_LARGE =
 WAYPOINT_ICONS_LARGE += wp_1st_aid_large.png
@@ -128,6 +128,7 @@ WAYPOINT_ICONS_LARGE += wp_dive1_large.png
 WAYPOINT_ICONS_LARGE += wp_dive2_large.png
 WAYPOINT_ICONS_LARGE += wp_dollar_large.png
 WAYPOINT_ICONS_LARGE += wp_drinking_wtr_large.png
+WAYPOINT_ICONS_LARGE += wp_exit_large.png
 WAYPOINT_ICONS_LARGE += wp_fastfood_large.png
 WAYPOINT_ICONS_LARGE += wp_fhs_facility_large.png
 WAYPOINT_ICONS_LARGE += wp_fish_large.png
@@ -142,6 +143,7 @@ WAYPOINT_ICONS_LARGE += wp_geocache_large.png
 WAYPOINT_ICONS_LARGE += wp_glider_large.png
 WAYPOINT_ICONS_LARGE += wp_golf_large.png
 WAYPOINT_ICONS_LARGE += wp_grnd_trans_large.png
+WAYPOINT_ICONS_LARGE += wp_helipad_large.png
 WAYPOINT_ICONS_LARGE += wp_horn_large.png
 WAYPOINT_ICONS_LARGE += wp_house_large.png
 WAYPOINT_ICONS_LARGE += wp_ice_skating_large.png
@@ -200,47 +202,46 @@ WAYPOINT_ICONS_LARGE += wp_wreck_large.png
 WAYPOINT_ICONS_LARGE += wp_zoo_large.png
 
 ICONS = \
-  viking.png \
-  bing_maps.png \
-  addtr_18.png \
-  begintr_18.png \
-  addwp_18.png \
-  edtr_18.png \
-  edwp_18.png \
-  geomove_18.png \
-  geozoom_18.png \
-  mapdl_18.png \
-  demdl_18.png \
-  mover_22.png \
-  ruler_18.png \
-  showpic_18.png \
-  zoom_18.png \
-  iscissors_18.png \
-  route_finder_18.png \
-  select_18.png \
-  thumbnails.png \
-  vikaggregatelayer.png \
-  vikcoordlayer.png \
-  vikdemlayer.png \
-  vikgeoreflayer.png \
-  vikgpslayer.png \
-  vikmapslayer.png \
-  viktrwlayer.png
+       viking.png \
+       bing_maps.png \
+       addtr_18.png \
+       vik_new_route_18.png \
+       addwp_18.png \
+       edtr_18.png \
+       edwp_18.png \
+       geomove_18.png \
+       geozoom_18.png \
+       mapdl_18.png \
+       demdl_18.png \
+       mover_22.png \
+       ruler_18.png \
+       showpic_18.png \
+       zoom_18.png \
+       route_finder_18.png \
+       select_18.png \
+       thumbnails.png \
+       vikaggregatelayer.png \
+       vikcoordlayer.png \
+       vikdemlayer.png \
+       vikgeoreflayer.png \
+       vikgpslayer.png \
+       vikmapslayer.png \
+       viktrwlayer.png
 
 CURSORS = \
-  cursor_addtr.png \
-  cursor_begintr.png \
-  cursor_edtr.png \
-  cursor_geozoom.png \
-  cursor_ruler.png \
-  cursor_addwp.png \
-  cursor_edwp.png \
-  cursor_route_finder.png \
-  cursor_showpic.png \
-  cursor_demdl.png \
-  cursor_geomove.png \
-  cursor_mapdl.png \
-  cursor_zoom.png
+       cursor_addtr.png \
+       cursor_new_route.png \
+       cursor_edtr.png \
+       cursor_geozoom.png \
+       cursor_ruler.png \
+       cursor_addwp.png \
+       cursor_edwp.png \
+       cursor_route_finder.png \
+       cursor_showpic.png \
+       cursor_demdl.png \
+       cursor_geomove.png \
+       cursor_mapdl.png \
+       cursor_zoom.png
 
 ALL_ICONS = $(ICONS) $(WAYPOINT_ICONS) $(WAYPOINT_ICONS_LARGE) $(CURSORS)
 EXTRA_DIST = $(ALL_ICONS)
@@ -248,6 +249,12 @@ ALL_ICONS_HEADER = $(ALL_ICONS:.png=_pixmap.h)
 
 BUILT_SOURCES = $(ALL_ICONS_HEADER) icons.c icons.h
 CLEANFILES = $(BUILT_SOURCES)
+SUFFIXES = .png _pixmap.h
+
+.png_pixmap.h:
+       gdk-pixbuf-csource --name="`basename $< .png`_pixbuf" --struct --extern $< > $@
+       cat $@ | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > temp$@.h
+       mv temp$@.h $@
 
 noinst_LIBRARIES = libicons.a
 libicons_a_SOURCES = icons.c icons.h
@@ -261,11 +268,6 @@ icons.c: $(ALL_ICONS_HEADER)
        echo "#include <gdk-pixbuf/gdk-pixdata.h>" >> $@
        for file in *_pixmap.h ; do echo "#include \"$$file\"" >> $@ ; done
 
-%_pixmap.h: %.png
-       gdk-pixbuf-csource --name="`basename $< .png`_pixbuf" --struct --extern $< > $@
-       cat $@ | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > temp$@.h
-       mv temp$@.h $@
-
 $(BUILT_SOURCES): $(srcdir)/Makefile.am
 
 AM_CFLAGS       = -Wall -g -D_GNU_SOURCE \