Merge pull request #13 from JojoBoulix/reproducible

[andy/viking.git] / src / icons / Makefile.am

diff --git a/src/icons/Makefile.am b/src/icons/Makefile.am
index 26c4f785fad04e245add10c3fc10f2c1b2eeee2a..112ebb19f017a656c22f9f8abe1fca97d9efeb93 100644 (file)
--- a/src/icons/Makefile.am
+++ b/src/icons/Makefile.am
@@ -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_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
 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_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
 WAYPOINT_ICONS_LARGE += wp_horn_large.png
 WAYPOINT_ICONS_LARGE += wp_house_large.png
 WAYPOINT_ICONS_LARGE += wp_ice_skating_large.png


@@ -203,7 +205,7 @@ ICONS = \
        viking.png \
        bing_maps.png \
        addtr_18.png \
        viking.png \
        bing_maps.png \
        addtr_18.png \

-       begintr_18.png \
+       vik_new_route_18.png \

        addwp_18.png \
        edtr_18.png \
        edwp_18.png \
        addwp_18.png \
        edtr_18.png \
        edwp_18.png \


@@ -224,11 +226,12 @@ ICONS = \
        vikgeoreflayer.png \
        vikgpslayer.png \
        vikmapslayer.png \
        vikgeoreflayer.png \
        vikgpslayer.png \
        vikmapslayer.png \

+       vikmapniklayer.png \

        viktrwlayer.png
 
 CURSORS = \
        cursor_addtr.png \
        viktrwlayer.png
 
 CURSORS = \
        cursor_addtr.png \

-       cursor_begintr.png \
+       cursor_new_route.png \

        cursor_edtr.png \
        cursor_geozoom.png \
        cursor_ruler.png \
        cursor_edtr.png \
        cursor_geozoom.png \
        cursor_ruler.png \


@@ -264,7 +267,7 @@ icons.h: $(ALL_ICONS_HEADER)
 icons.c: $(ALL_ICONS_HEADER)
        echo "/* Generated file */" > $@
        echo "#include <gdk-pixbuf/gdk-pixdata.h>" >> $@
 icons.c: $(ALL_ICONS_HEADER)
        echo "/* Generated file */" > $@
        echo "#include <gdk-pixbuf/gdk-pixdata.h>" >> $@

-       for file in *_pixmap.h ; do echo "#include \"$$file\"" >> $@ ; done
+       for file in $(ALL_ICONS_HEADER) ; do echo "#include \"$$file\"" >> $@ ; done

 
 $(BUILT_SOURCES): $(srcdir)/Makefile.am
 
 
 $(BUILT_SOURCES): $(srcdir)/Makefile.am