Make sure we won't pick up unwanted _pixmap.h files

Signed-off-by: Quy Tonthat <qtonthat@gmail.com>

diff --git a/ChangeLog b/ChangeLog
index e40dcb196e2ab4799eb291b00086e7aaf25f3656..6b7d600155512ebaf2f43d6864618819fea5f362 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@ Quy Tonthat <qtonthat@gmail.com>:
        * Waypoint Property Dialog: The combo box "symbol" (used for selecting
        waypoint symbol) now has tooltip that shows the name of the selected
        symbol.
+       * src/icons/Makefile.am: Make sure we won't pick up unwanted _pixmap.h
+       files
 
 2008-10-28
 Quy Tonthat <qtonthat@gmail.com>:

diff --git a/src/icons/Makefile.am b/src/icons/Makefile.am
index 7654d4b85da24de779739a42de136c2fe2dbad3e..3515777cb02cc963b3ba62e42dcdd843ab7c958f 100644 (file)
--- a/src/icons/Makefile.am
+++ b/src/icons/Makefile.am
@@ -241,7 +241,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 +251,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 */" > $@