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.
This commit is contained in:
		 Michael Natterer
					Michael Natterer
				
			
				
					committed by
					
						 Michael Natterer
						Michael Natterer
					
				
			
			
				
	
			
			
			 Michael Natterer
						Michael Natterer
					
				
			
						parent
						
							cecf4b5c3d
						
					
				
				
					commit
					9bff21f556
				
			| @ -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 | ||||
|  | ||||
		Reference in New Issue
	
	Block a user