AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Conditionalize deendencies for gdk-pixbuf-csource on cross-compilation

Browse Source 
Thu Jun  5 20:35:40 2003  Owen Taylor  <otaylor@redhat.com>

        * demos/Makefile.am: Conditionalize deendencies for
        gdk-pixbuf-csource on cross-compilation (#112391, J. Ali Harlowe).
        Buildtest-inline-pixbufs.h in srcdir. Don't try to build
        test-inline-pixbufs.h if we don't have libpng.

        * gtk/stock-icons/Makefile.am (gtkstockpixbufs.h):
        Add a dependency on gdk-pixbuf.loaders when not
        cross-compiling, remove the dependency on gdk-pixbuf-csource
        when not cross compiling.
This commit is contained in:
Owen Taylor 2003-06-06 00:52:20 +00:00 committed by Owen Taylor
parent d4ed293db4
commit ff5da26286
7 changed files with 80 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
Thu Jun 5 20:35:40 2003 Owen Taylor <otaylor@redhat.com>
* demos/Makefile.am: Conditionalize deendencies for
gdk-pixbuf-csource on cross-compilation (#112391, J. Ali Harlowe).
Buildtest-inline-pixbufs.h in srcdir. Don't try to build
test-inline-pixbufs.h if we don't have libpng.
* gtk/stock-icons/Makefile.am (gtkstockpixbufs.h):
Add a dependency on gdk-pixbuf.loaders when not
cross-compiling, remove the dependency on gdk-pixbuf-csource
when not cross compiling.
Thu Jun 5 20:12:51 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_get_default_size): Handle

12
ChangeLog.pre-2-10
View File

@ -1,3 +1,15 @@
Thu Jun 5 20:35:40 2003 Owen Taylor <otaylor@redhat.com>
* demos/Makefile.am: Conditionalize deendencies for
gdk-pixbuf-csource on cross-compilation (#112391, J. Ali Harlowe).
Buildtest-inline-pixbufs.h in srcdir. Don't try to build
test-inline-pixbufs.h if we don't have libpng.
* gtk/stock-icons/Makefile.am (gtkstockpixbufs.h):
Add a dependency on gdk-pixbuf.loaders when not
cross-compiling, remove the dependency on gdk-pixbuf-csource
when not cross compiling.
Thu Jun 5 20:12:51 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_get_default_size): Handle

12
ChangeLog.pre-2-4
View File

@ -1,3 +1,15 @@
Thu Jun 5 20:35:40 2003 Owen Taylor <otaylor@redhat.com>
* demos/Makefile.am: Conditionalize deendencies for
gdk-pixbuf-csource on cross-compilation (#112391, J. Ali Harlowe).
Buildtest-inline-pixbufs.h in srcdir. Don't try to build
test-inline-pixbufs.h if we don't have libpng.
* gtk/stock-icons/Makefile.am (gtkstockpixbufs.h):
Add a dependency on gdk-pixbuf.loaders when not
cross-compiling, remove the dependency on gdk-pixbuf-csource
when not cross compiling.
Thu Jun 5 20:12:51 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_get_default_size): Handle

12
ChangeLog.pre-2-6
View File

@ -1,3 +1,15 @@
Thu Jun 5 20:35:40 2003 Owen Taylor <otaylor@redhat.com>
* demos/Makefile.am: Conditionalize deendencies for
gdk-pixbuf-csource on cross-compilation (#112391, J. Ali Harlowe).
Buildtest-inline-pixbufs.h in srcdir. Don't try to build
test-inline-pixbufs.h if we don't have libpng.
* gtk/stock-icons/Makefile.am (gtkstockpixbufs.h):
Add a dependency on gdk-pixbuf.loaders when not
cross-compiling, remove the dependency on gdk-pixbuf-csource
when not cross compiling.
Thu Jun 5 20:12:51 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_get_default_size): Handle

12
ChangeLog.pre-2-8
View File

@ -1,3 +1,15 @@
Thu Jun 5 20:35:40 2003 Owen Taylor <otaylor@redhat.com>
* demos/Makefile.am: Conditionalize deendencies for
gdk-pixbuf-csource on cross-compilation (#112391, J. Ali Harlowe).
Buildtest-inline-pixbufs.h in srcdir. Don't try to build
test-inline-pixbufs.h if we don't have libpng.
* gtk/stock-icons/Makefile.am (gtkstockpixbufs.h):
Add a dependency on gdk-pixbuf.loaders when not
cross-compiling, remove the dependency on gdk-pixbuf-csource
when not cross compiling.
Thu Jun 5 20:12:51 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_get_default_size): Handle

28
demos/Makefile.am
View File

@ -23,26 +23,32 @@ LDADDS = \
$(top_builddir)/gtk/$(gtktargetlib)
noinst_PROGRAMS = \
testpixbuf \
testpixbuf-drawable \
testanimation \
testpixbuf-save \
testpixbuf-scale \
pixbuf-demo
if CROSS_COMPILING
pixbuf_csource=$(GDK_PIXBUF_CSOURCE)
else
pixbuf_csource=GDK_PIXBUF_MODULE_FILE=$$topdir/gdk-pixbuf/gdk-pixbuf.loaders $$topdir/gdk-pixbuf/gdk-pixbuf-csource
# Need to build test-inline-pixbufs.h for testpixbuf
if HAVE_PNG
noinst_PROGRAMS += testpixbuf
BUILT_SOURCES = test-inline-pixbufs.h
endif
BUILT_SOURCES = test-inline-pixbufs.h
if CROSS_COMPILING
pixbuf_csource=$(GDK_PIXBUF_CSOURCE)
pixbuf_csource_deps=
else
pixbuf_csource=GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource
pixbuf_csource_deps=$(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders
endif
test-inline-pixbufs.h: $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders apple-red.png gnome-foot.png
(topdir=`cd $(top_builddir) && pwd` ; curdir=`pwd` ; \
cd $(srcdir) && \
$(pixbuf_csource) --build-list \
apple_red apple-red.png gnome_foot gnome-foot.png >$$curdir/test-inline-pixbufs.h || (rm -f $$curdir/test-inline-pixbufs.h && false))
test-inline-pixbufs.h: $(pixbuf_csource_deps) apple-red.png gnome-foot.png
$(pixbuf_csource) --raw --build-list \
apple_red $(srcdir)/apple-red.png \
gnome_foot $(srcdir)/gnome-foot.png \
> test-inline-pixbufs.h \
|| (rm -f test-inline-pixbufs.h && false)
testpixbuf_DEPENDENCIES = $(DEPS)
testpixbuf_drawable_DEPENDENCIES = $(DEPS)

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

@ -258,11 +258,13 @@ CLEANFILES = $(noinst_DATA)
if CROSS_COMPILING
pixbuf_csource=$(GDK_PIXBUF_CSOURCE)
pixbuf_csource_deps=
else
pixbuf_csource=GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource
pixbuf_csource_deps=$(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders
endif
gtkstockpixbufs.h: @REBUILD_PNGS@ $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(IMAGES)
gtkstockpixbufs.h: @REBUILD_PNGS@ $(pixbuf_csource_deps) $(IMAGES)
$(pixbuf_csource) \
--raw --build-list $(VARIABLES1) > gtkstockpixbufs.h || \
( rm -f gtkstockpixbufs.h && false )