From 79a78d0249676255e902c9207a0eec4aba179de6 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Thu, 7 Jul 2005 12:11:49 +0000 Subject: [PATCH] *** empty log message *** --- pixbuf/Makefile.am | 5 +---- shell/Makefile.am | 24 ++++-------------------- 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/pixbuf/Makefile.am b/pixbuf/Makefile.am index afa551b7..11cc42a1 100644 --- a/pixbuf/Makefile.am +++ b/pixbuf/Makefile.am @@ -1,13 +1,10 @@ INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/backend \ - $(PIXBUF_CFLAGS) \ - -DDATADIR=\""$(datadir)"\" + $(BACKEND_CFLAGS) noinst_LTLIBRARIES = libpixbufdocument.la libpixbufdocument_la_SOURCES = \ pixbuf-document.c \ pixbuf-document.h - -libpixbufdocument_la_LIBADD = $(PIXBUF_LIBS) diff --git a/shell/Makefile.am b/shell/Makefile.am index a8ba810f..8b6cd7d7 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -1,5 +1,3 @@ -NULL= - INCLUDES= \ -DDATADIR=\"$(pkgdatadir)\" \ -DGNOMEDATADIR=\"$(datadir)\" \ @@ -13,12 +11,7 @@ INCLUDES= \ -DGNOMEICONDIR=\""$(datadir)/pixmaps"\" \ $(SHELL_CFLAGS) \ $(WARN_CFLAGS) \ - $(DISABLE_DEPRECATED) \ - $(NULL) - -if ENABLE_DBUS -INCLUDES += $(DBUS_CFLAGS) -endif + $(DISABLE_DEPRECATED) bin_PROGRAMS=evince @@ -71,8 +64,7 @@ evince_SOURCES= \ ev-statusbar.h \ ev-stock-icons.c \ ev-stock-icons.h \ - main.c \ - $(NULL) + main.c if ENABLE_METADATA evince_SOURCES += \ @@ -83,18 +75,10 @@ endif evince_LDADD= \ $(SHELL_LIBS) \ $(top_builddir)/cut-n-paste/recent-files/librecent.la \ - $(top_builddir)/cut-n-paste/zoom-control/libephymisc.la \ - $(top_builddir)/cut-n-paste/zoom-control/libephywidgets.la \ + $(top_builddir)/cut-n-paste/zoom-control/libephyzoom.la \ $(top_builddir)/cut-n-paste/toolbar-editor/libtoolbareditor.la \ $(top_builddir)/properties/libevproperties.la \ - $(top_builddir)/lib/libev.la \ - $(top_builddir)/backend/libevbackend.la \ - -ltiff -lz \ - $(NULL) - -if ENABLE_DBUS -evince_LDADD += $(DBUS_LIBS) -endif + $(top_builddir)/lib/libev.la BUILT_SOURCES = ev-marshal.h ev-marshal.c -- 2.43.5