diff options
| author | Michael Natterer <mitch@gimp.org> | 2002-05-07 15:53:08 +0000 |
|---|---|---|
| committer | Michael Natterer <mitch@src.gnome.org> | 2002-05-07 15:53:08 +0000 |
| commit | 9bff21f5562747da0e4877032a5338865d073a33 (patch) | |
| tree | e53932bc5f14072e2920cbbd53df50e9d968888f /gtk/stock-icons | |
| parent | cecf4b5c3de41e5784935b36744b843855aa475a (diff) | |
| download | gtk+-9bff21f5562747da0e4877032a5338865d073a33.tar.gz | |
added a new conditional CROSS_COMPILING which indicates ($build != $host).
2002-05-07 Michael Natterer <mitch@gimp.org>
* configure.in: added a new conditional CROSS_COMPILING which
indicates ($build != $host). If it is set, look for
gdk-pixbuf-csource in PATH. Error out if it was not found.
* gtk/stock-icons/Makefile.am: use the gdk-pixbuf-csource found at
configure time if CROSS_COMPILING is set, use the one which was
just built otherwise.
Diffstat (limited to 'gtk/stock-icons')
| -rw-r--r-- | gtk/stock-icons/Makefile.am | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/gtk/stock-icons/Makefile.am b/gtk/stock-icons/Makefile.am index fdf9421f4d..9fa7c2f677 100644 --- a/gtk/stock-icons/Makefile.am +++ b/gtk/stock-icons/Makefile.am @@ -257,20 +257,24 @@ VARIABLES6 = @STRIP_BEGIN@ \ noinst_DATA = gtkstockpixbufs.h CLEANFILES = $(noinst_DATA) -pixbuf_dir = $(top_builddir)/gdk-pixbuf +if CROSS_COMPILING +pixbuf_csource=$(GDK_PIXBUF_CSOURCE) +else +pixbuf_csource=GDK_PIXBUF_MODULEDIR=$(top_builddir)/gdk-pixbuf $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource +endif -gtkstockpixbufs.h: $(pixbuf_dir)/gdk-pixbuf-csource $(IMAGES) - GDK_PIXBUF_MODULEDIR=$(pixbuf_dir) \ - $(pixbuf_dir)/gdk-pixbuf-csource --raw --build-list $(VARIABLES1) >$(srcdir)/gtkstockpixbufs.h - GDK_PIXBUF_MODULEDIR=$(pixbuf_dir) \ - $(pixbuf_dir)/gdk-pixbuf-csource --raw --build-list $(VARIABLES2) >>$(srcdir)/gtkstockpixbufs.h - GDK_PIXBUF_MODULEDIR=$(pixbuf_dir) \ - $(pixbuf_dir)/gdk-pixbuf-csource --raw --build-list $(VARIABLES3) >>$(srcdir)/gtkstockpixbufs.h - GDK_PIXBUF_MODULEDIR=$(pixbuf_dir) \ - $(pixbuf_dir)/gdk-pixbuf-csource --raw --build-list $(VARIABLES4) >>$(srcdir)/gtkstockpixbufs.h - GDK_PIXBUF_MODULEDIR=$(pixbuf_dir) \ - $(pixbuf_dir)/gdk-pixbuf-csource --raw --build-list $(VARIABLES5) >>$(srcdir)/gtkstockpixbufs.h - GDK_PIXBUF_MODULEDIR=$(pixbuf_dir) \ - $(pixbuf_dir)/gdk-pixbuf-csource --raw --build-list $(VARIABLES6) >>$(srcdir)/gtkstockpixbufs.h +gtkstockpixbufs.h: $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(IMAGES) + $(pixbuf_csource) \ + --raw --build-list $(VARIABLES1) >$(srcdir)/gtkstockpixbufs.h + $(pixbuf_csource) \ + --raw --build-list $(VARIABLES2) >>$(srcdir)/gtkstockpixbufs.h + $(pixbuf_csource) \ + --raw --build-list $(VARIABLES3) >>$(srcdir)/gtkstockpixbufs.h + $(pixbuf_csource) \ + --raw --build-list $(VARIABLES4) >>$(srcdir)/gtkstockpixbufs.h + $(pixbuf_csource) \ + --raw --build-list $(VARIABLES5) >>$(srcdir)/gtkstockpixbufs.h + $(pixbuf_csource) \ + --raw --build-list $(VARIABLES6) >>$(srcdir)/gtkstockpixbufs.h EXTRA_DIST = $(IMAGES) gtkstockpixbufs.h |