From eddc47d1a1185ad790e52ec65dba533ca29fd74e Mon Sep 17 00:00:00 2001 From: Mark Crichton Date: Thu, 2 Mar 2000 06:08:53 +0000 Subject: [PATCH] This sucks This sucks --- gdk-pixbuf/ChangeLog | 5 +++++ gdk-pixbuf/Makefile.am | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 7b017f3c55..5518766f2b 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,8 @@ +2000-03-01 Mark Crichton + + * gdk-pixbuf/Makefile.am: Automake can go to hell for all I + care + 2000-03-01 Mark Crichton * gdk-pixbuf/Makefile.am: Doh. Still trying to compile the diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am index ca4554a46b..9e34123b3e 100644 --- a/gdk-pixbuf/Makefile.am +++ b/gdk-pixbuf/Makefile.am @@ -1,21 +1,21 @@ SUBDIRS = pixops -if (!BUILD_CANVAS_ITEM) -CANVAS_PIXBUF_LIB = -CANVAS_PIXBUF_HEADERFILES = -EXTRA_GNOME_LIBS = -else +if BUILD_CANVAS_ITEM 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) +else +CANVAS_PIXBUF_LIB = +CANVAS_PIXBUF_HEADERFILES = +EXTRA_GNOME_LIBS = endif lib_LTLIBRARIES = \ libgdk_pixbuf.la \ $(CANVAS_PIXBUF_LIB) +libgnomecanvaspixbuf_la_LDFLAGS = $(EXTRA_GNOME_LIBS) libexecdir = $(libdir)/gdk-pixbuf/loaders