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

Merged in changes.

Browse Source 
Merged in changes.

If this doesn't work, I blame the NWO conspiracy.

I need to go put my tin foil hat back on now, and keep a lookout for the
black helicopters.
This commit is contained in:
Mark Crichton 2000-03-03 03:57:15 +00:00
parent 25472c7578
commit 2468916bcc
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gdk-pixbuf/ChangeLog
View File

@ -1,3 +1,11 @@
2000-03-01 Mark Crichton <crichton@gimp.org>
* configure.in: Added BUILD_CANVAS_ITEM stuff to (finally)
fix the last auto* build bug (where we have libart, but no
gnome-libs)
* gdk-pixbuf/Makefile.am: Same.
2000-02-28 Matt Wilson <msw@redhat.com> 2000-02-28 Matt Wilson <msw@redhat.com>
* gdk-pixbuf/gdk-pixbuf-drawable.c: s/unsigned long/guint32/g, * gdk-pixbuf/gdk-pixbuf-drawable.c: s/unsigned long/guint32/g,

12
gdk-pixbuf/Makefile.am
View File

@ -1,20 +1,20 @@
SUBDIRS = pixops SUBDIRS = pixops
if INSIDE_GNOME_LIBS if BUILD_CANVAS_ITEM
CANVAS_PIXBUF_LIB = libgnomecanvaspixbuf.la
CANVAS_PIXBUF_HEADERFILES=gnome-canvas-pixbuf.h
libgnomecanvaspixbuf_la_SOURCES = gnome-canvas-pixbuf.c
EXTRA_GNOME_LIBS = $(GNOME_LIBS)
else
CANVAS_PIXBUF_LIB = CANVAS_PIXBUF_LIB =
CANVAS_PIXBUF_HEADERFILES = CANVAS_PIXBUF_HEADERFILES =
EXTRA_GNOME_LIBS = EXTRA_GNOME_LIBS =
else
CANVAS_PIXBUF_LIB = libgnomecanvaspixbuf.la
CANVAS_PIXBUF_HEADERFILES=gnome-canvas-pixbuf.h
EXTRA_GNOME_LIBS = $(GNOME_LIBS)
endif endif
lib_LTLIBRARIES = \ lib_LTLIBRARIES = \
libgdk_pixbuf.la \ libgdk_pixbuf.la \
$(CANVAS_PIXBUF_LIB) $(CANVAS_PIXBUF_LIB)
libgnomecanvaspixbuf_la_SOURCES = gnome-canvas-pixbuf.c
libgnomecanvaspixbuf_la_LDFLAGS = $(EXTRA_GNOME_LIBS) libgnomecanvaspixbuf_la_LDFLAGS = $(EXTRA_GNOME_LIBS)
libexecdir = $(libdir)/gdk-pixbuf/loaders libexecdir = $(libdir)/gdk-pixbuf/loaders