callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added a new conditional CROSS_COMPILING which indicates ($build != $host).

Browse Source 
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
2002-05-07 15:53:08 +00:00
committed by Michael Natterer
parent cecf4b5c3d
commit 9bff21f556
8 changed files with 88 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
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.
2002-05-07 Anders Carlsson <andersca@gnu.org> 2002-05-07 Anders Carlsson <andersca@gnu.org>
* gdk/x11/xsettings-client.c (xsettings_client_process_event): * gdk/x11/xsettings-client.c (xsettings_client_process_event):

10
ChangeLog.pre-2-10
View File

@ -1,3 +1,13 @@
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.
2002-05-07 Anders Carlsson <andersca@gnu.org> 2002-05-07 Anders Carlsson <andersca@gnu.org>
* gdk/x11/xsettings-client.c (xsettings_client_process_event): * gdk/x11/xsettings-client.c (xsettings_client_process_event):

10
ChangeLog.pre-2-2
View File

@ -1,3 +1,13 @@
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.
2002-05-07 Anders Carlsson <andersca@gnu.org> 2002-05-07 Anders Carlsson <andersca@gnu.org>
* gdk/x11/xsettings-client.c (xsettings_client_process_event): * gdk/x11/xsettings-client.c (xsettings_client_process_event):

10
ChangeLog.pre-2-4
View File

@ -1,3 +1,13 @@
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.
2002-05-07 Anders Carlsson <andersca@gnu.org> 2002-05-07 Anders Carlsson <andersca@gnu.org>
* gdk/x11/xsettings-client.c (xsettings_client_process_event): * gdk/x11/xsettings-client.c (xsettings_client_process_event):

10
ChangeLog.pre-2-6
View File

@ -1,3 +1,13 @@
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.
2002-05-07 Anders Carlsson <andersca@gnu.org> 2002-05-07 Anders Carlsson <andersca@gnu.org>
* gdk/x11/xsettings-client.c (xsettings_client_process_event): * gdk/x11/xsettings-client.c (xsettings_client_process_event):

10
ChangeLog.pre-2-8
View File

@ -1,3 +1,13 @@
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.
2002-05-07 Anders Carlsson <andersca@gnu.org> 2002-05-07 Anders Carlsson <andersca@gnu.org>
* gdk/x11/xsettings-client.c (xsettings_client_process_event): * gdk/x11/xsettings-client.c (xsettings_client_process_event):

10
configure.in
View File

@ -879,6 +879,16 @@ fi
AM_CONDITIONAL(USE_MMX, test x$use_mmx_asm = xyes) AM_CONDITIONAL(USE_MMX, test x$use_mmx_asm = xyes)
dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling
AM_CONDITIONAL(CROSS_COMPILING, test $build != $host)
if test $CROSS_COMPILING; then
AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
if test x$GDK_PIXBUF_CSOURCE = xno; then
AC_MSG_ERROR(Could not find a gdk-pixbuf-csource in your PATH)
fi
fi
GDK_PIXBUF_PACKAGES="gmodule-2.0 gobject-2.0" GDK_PIXBUF_PACKAGES="gmodule-2.0 gobject-2.0"
GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB" GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB"

32
gtk/stock-icons/Makefile.am
View File

@ -257,20 +257,24 @@ VARIABLES6 = @STRIP_BEGIN@ \
noinst_DATA = gtkstockpixbufs.h noinst_DATA = gtkstockpixbufs.h
CLEANFILES = $(noinst_DATA) 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) gtkstockpixbufs.h: $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(IMAGES)
GDK_PIXBUF_MODULEDIR=$(pixbuf_dir) \ $(pixbuf_csource) \
$(pixbuf_dir)/gdk-pixbuf-csource --raw --build-list $(VARIABLES1) >$(srcdir)/gtkstockpixbufs.h --raw --build-list $(VARIABLES1) >$(srcdir)/gtkstockpixbufs.h
GDK_PIXBUF_MODULEDIR=$(pixbuf_dir) \ $(pixbuf_csource) \
$(pixbuf_dir)/gdk-pixbuf-csource --raw --build-list $(VARIABLES2) >>$(srcdir)/gtkstockpixbufs.h --raw --build-list $(VARIABLES2) >>$(srcdir)/gtkstockpixbufs.h
GDK_PIXBUF_MODULEDIR=$(pixbuf_dir) \ $(pixbuf_csource) \
$(pixbuf_dir)/gdk-pixbuf-csource --raw --build-list $(VARIABLES3) >>$(srcdir)/gtkstockpixbufs.h --raw --build-list $(VARIABLES3) >>$(srcdir)/gtkstockpixbufs.h
GDK_PIXBUF_MODULEDIR=$(pixbuf_dir) \ $(pixbuf_csource) \
$(pixbuf_dir)/gdk-pixbuf-csource --raw --build-list $(VARIABLES4) >>$(srcdir)/gtkstockpixbufs.h --raw --build-list $(VARIABLES4) >>$(srcdir)/gtkstockpixbufs.h
GDK_PIXBUF_MODULEDIR=$(pixbuf_dir) \ $(pixbuf_csource) \
$(pixbuf_dir)/gdk-pixbuf-csource --raw --build-list $(VARIABLES5) >>$(srcdir)/gtkstockpixbufs.h --raw --build-list $(VARIABLES5) >>$(srcdir)/gtkstockpixbufs.h
GDK_PIXBUF_MODULEDIR=$(pixbuf_dir) \ $(pixbuf_csource) \
$(pixbuf_dir)/gdk-pixbuf-csource --raw --build-list $(VARIABLES6) >>$(srcdir)/gtkstockpixbufs.h --raw --build-list $(VARIABLES6) >>$(srcdir)/gtkstockpixbufs.h
EXTRA_DIST = $(IMAGES) gtkstockpixbufs.h EXTRA_DIST = $(IMAGES) gtkstockpixbufs.h