X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/8eb76f51a2a5c7b6f3bbf1b6177bd0e54ce5d5e7..7ee554493260f2233d5984527188850a5404984f:/src/icons/Makefile.am?ds=inline

diff --git a/src/icons/Makefile.am b/src/icons/Makefile.am
index 7654d4b8..f775d95b 100644
--- a/src/icons/Makefile.am
+++ b/src/icons/Makefile.am
@@ -201,6 +201,7 @@ WAYPOINT_ICONS_LARGE += wp_zoo_large.png
 
 ICONS = \
   viking.png \
+  bing_maps.png \
   addtr_18.png \
   begintr_18.png \
   addwp_18.png \
@@ -215,6 +216,7 @@ ICONS = \
   showpic_18.png \
   zoom_18.png \
   iscissors_18.png \
+  select_18.png \
   thumbnails.png \
   vikaggregatelayer.png \
   vikcoordlayer.png \
@@ -241,7 +243,7 @@ CURSORS = \
 
 ALL_ICONS = $(ICONS) $(WAYPOINT_ICONS) $(WAYPOINT_ICONS_LARGE) $(CURSORS)
 EXTRA_DIST = $(ALL_ICONS)
-ALL_ICONS_HEADER = $(ALL_ICONS:%.png=%_pixmap.h)
+ALL_ICONS_HEADER = $(ALL_ICONS:.png=_pixmap.h)
 
 BUILT_SOURCES = $(ALL_ICONS_HEADER) icons.c icons.h
 CLEANFILES = $(BUILT_SOURCES)
@@ -251,7 +253,7 @@ libicons_a_SOURCES = icons.c icons.h
 
 icons.h: $(ALL_ICONS_HEADER)
 	echo "/* Generated file */" > $@
-	sed -n "s/^\(const.*\) = {/extern \1;/p" *_pixmap.h >> $@
+	sed -n "s/^\(const.*\) = {/extern \1;/p" $(ALL_ICONS_HEADER) >> $@
 
 icons.c: $(ALL_ICONS_HEADER)
 	echo "/* Generated file */" > $@
@@ -265,8 +267,8 @@ icons.c: $(ALL_ICONS_HEADER)
 
 $(BUILT_SOURCES): $(srcdir)/Makefile.am
 
-INCLUDES        = @GTK_CFLAGS@
-AM_CFLAGS       = -Wall -g -D_GNU_SOURCE
+AM_CFLAGS       = -Wall -g -D_GNU_SOURCE \
+	$(PACKAGE_CFLAGS)
 
 iconsdir = $(datadir)/icons/hicolor/48x48/apps
 icons_DATA = viking.png