Dear developers, attached you find a patch to fix an incompatible make file rules (using "%"); this is complained by automake. The broken rule is substituted by proper new one.
The patch fixes also the missing tabulators in file listings. Guido -- http://www.bayernline.de/~gscholz/ http://www.lug-burghausen.org/
diff -Nur viking-1.3/src/icons//Makefile.am viking-1.3_gs/src/icons//Makefile.am --- viking-1.3/src/icons//Makefile.am 2012-08-04 13:38:54.000000000 +0200 +++ viking-1.3_gs/src/icons//Makefile.am 2012-08-04 18:40:31.969829897 +0200 @@ -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 @@ -200,46 +200,46 @@ 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 \ - 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 \ + 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 \ + 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_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 ALL_ICONS = $(ICONS) $(WAYPOINT_ICONS) $(WAYPOINT_ICONS_LARGE) $(CURSORS) EXTRA_DIST = $(ALL_ICONS) @@ -247,6 +247,12 @@ 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 @@ -260,11 +266,6 @@ 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 \
signature.asc
Description: Digital signature
------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________ Viking-devel mailing list Viking-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/viking-devel Viking home page: http://viking.sf.net/
