Applied parts of a patch from Daniel Richard G. (bug #445374):

2007-06-08  Sven Neumann  <sven@gimp.org>

	Applied parts of a patch from Daniel Richard G. (bug #445374):

	* themes/Default/images/Makefile.am
	* data/tips/Makefile.am
	* menus/Makefile.am: more srcdir/builddir tweaks.

svn path=/trunk/; revision=22744
This commit is contained in:
Sven Neumann 2007-06-08 11:11:57 +00:00 committed by Sven Neumann
parent 3ce8d74b14
commit 3ae875bbf5
4 changed files with 14 additions and 8 deletions

View File

@ -1,3 +1,11 @@
2007-06-08 Sven Neumann <sven@gimp.org>
Applied parts of a patch from Daniel Richard G. (bug #445374):
* themes/Default/images/Makefile.am
* data/tips/Makefile.am
* menus/Makefile.am: more srcdir/builddir tweaks.
2007-06-08 Sven Neumann <sven@gimp.org> 2007-06-08 Sven Neumann <sven@gimp.org>
* app/core/gimpviewable.h: #define GIMP_VIEWABLE_PRIORITY_IDLE, * app/core/gimpviewable.h: #define GIMP_VIEWABLE_PRIORITY_IDLE,

View File

@ -23,8 +23,7 @@ gimp-tips.xml: gimp-tips.xml.in $(wildcard $(top_srcdir)/po-tips/*.po)
validate: gimp-tips.xml validate: gimp-tips.xml
if HAVE_XMLLINT if HAVE_XMLLINT
@cd $(srcdir); \ @$(XMLLINT) --noout --path $(srcdir) --valid $< || \
$(XMLLINT) --noout --valid gimp-tips.xml || \
( echo "* gimp-tips.xml INVALID *"; exit 1; ) ( echo "* gimp-tips.xml INVALID *"; exit 1; )
endif endif

View File

@ -62,9 +62,8 @@ endif
validate: $(menudata_DATA) validate: $(menudata_DATA)
if HAVE_XMLLINT if HAVE_XMLLINT
@cd $(srcdir); \ @for menu in $^; do \
for menu in $(menudata_DATA); do \ $(XMLLINT) --noout --path $(srcdir) --valid $$menu || \
$(XMLLINT) --noout --valid $$menu || \
( echo "*** $$menu INVALID ***"; exit 1; ) ; \ ( echo "*** $$menu INVALID ***"; exit 1; ) ; \
done done
endif endif

View File

@ -372,8 +372,8 @@ stock-icons.list: $(STOCK_IMAGES) Makefile.am
echo " $(srcdir)/$$image" >> $@; \ echo " $(srcdir)/$$image" >> $@; \
done ) done )
$(srcdir)/gimp-core-pixbufs.h: $(CORE_IMAGES) Makefile.am gimp-core-pixbufs.h: $(CORE_IMAGES) Makefile.am
$(GDK_PIXBUF_CSOURCE) --raw --build-list $(CORE_VARIABLES) > $(@F) $(GDK_PIXBUF_CSOURCE) --raw --build-list $(CORE_VARIABLES) > $(@F)
$(srcdir)/gimp-stock-pixbufs.h: stock-icons.list gimp-stock-pixbufs.h: stock-icons.list
$(GDK_PIXBUF_CSOURCE) --raw --build-list `cat stock-icons.list` > $(@F) $(GDK_PIXBUF_CSOURCE) --raw --build-list `cat $<` > $(@F)