From 0e5e03edb9367bdfae78da5a332a65528345e176 Mon Sep 17 00:00:00 2001 From: Mark Crichton Date: Thu, 2 Mar 2000 06:00:48 +0000 Subject: [PATCH] I need sleep I need sleep --- gdk-pixbuf/ChangeLog | 5 +++++ gdk-pixbuf/Makefile.am | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 70b47e9928..7b017f3c55 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,8 @@ +2000-03-01 Mark Crichton + + * gdk-pixbuf/Makefile.am: Doh. Still trying to compile the + canvas item. Moved the LDADD and SOURCES around to fix. + 2000-03-01 Mark Crichton * configure.in: Added BUILD_CANVAS_ITEM stuff to (finally) diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am index 0bd2b816b4..ca4554a46b 100644 --- a/gdk-pixbuf/Makefile.am +++ b/gdk-pixbuf/Makefile.am @@ -1,12 +1,14 @@ SUBDIRS = pixops -if BUILD_CANVAS_ITEM +if (!BUILD_CANVAS_ITEM) CANVAS_PIXBUF_LIB = CANVAS_PIXBUF_HEADERFILES = EXTRA_GNOME_LIBS = else CANVAS_PIXBUF_LIB = libgnomecanvaspixbuf.la CANVAS_PIXBUF_HEADERFILES=gnome-canvas-pixbuf.h +libgnomecanvaspixbuf_la_SOURCES = gnome-canvas-pixbuf.c +libgnomecanvaspixbuf_la_LDFLAGS = $(EXTRA_GNOME_LIBS) EXTRA_GNOME_LIBS = $(GNOME_LIBS) endif @@ -14,8 +16,6 @@ lib_LTLIBRARIES = \ libgdk_pixbuf.la \ $(CANVAS_PIXBUF_LIB) -libgnomecanvaspixbuf_la_SOURCES = gnome-canvas-pixbuf.c -libgnomecanvaspixbuf_la_LDFLAGS = $(EXTRA_GNOME_LIBS) libexecdir = $(libdir)/gdk-pixbuf/loaders