From b094d6ec67acbad319ffeaaec1a1ffabf8fc83d1 Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Mon, 16 Dec 2002 14:06:59 +0000 Subject: [PATCH] Make consistent with the other frontends, removing the if USE_BASIC_IMAGE_LOADER test. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5821 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/gnome/ChangeLog | 4 ++++ src/frontends/gnome/Makefile.am | 8 ++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/frontends/gnome/ChangeLog b/src/frontends/gnome/ChangeLog index 873f3691be..3e28aefc68 100644 --- a/src/frontends/gnome/ChangeLog +++ b/src/frontends/gnome/ChangeLog @@ -1,3 +1,7 @@ +2002-12-16 Angus Leeming + + * Makefile.am: remove the if USE_BASIC_IMAGE_LOADER test. + 2002-12-01 Lars Gullik Bjønnes * several files: ws changes diff --git a/src/frontends/gnome/Makefile.am b/src/frontends/gnome/Makefile.am index 39c585ec54..2551c5813b 100644 --- a/src/frontends/gnome/Makefile.am +++ b/src/frontends/gnome/Makefile.am @@ -8,11 +8,6 @@ INCLUDES = $(FRONTEND_INCLUDES) -I$(top_srcdir)/src/ \ -I$(top_srcdir)/src/frontends/controllers \ $(BOOST_INCLUDES) -if USE_BASIC_IMAGE_LOADER -else -XFORMSIMAGE = ../xforms/xformsImage.lo -endif - # alphabetised xforms_objects = \ ../xforms/Alert_pimpl.lo \ @@ -52,7 +47,8 @@ xforms_objects = \ ../xforms/xformsBC.lo \ ../xforms/XFormsView.lo \ ../xforms/XPainter.lo \ - ../xforms/XWorkArea.lo $(XFORMSIMAGE) + ../xforms/XWorkArea.lo \ + ../xforms/xformsImage.lo libgnome.la: xforms.lo $(libgnome_la_OBJECTS) $(libgnome_la_DEPENDENCIES)