From 1f38f4d92ca8eb97381b2c9a7022830a6d4bcaba Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 4 Oct 2011 21:32:41 -0400 Subject: Simplify library dependency flags. We have a confusing array of nearly-identical CFLAGS/LIBS definitions in configure.ac. Time to simplify. Instead let's just have one definition that includes all the libraries provided by Evolution-Data-Server (incl. Camel). That, in combination with GNOME_PLATFORM, gives us most of what we need for compliation and linking, and we can sprinkle definitions for additional library dependencies in Makefile.am's as needed. --- doc/reference/shell/Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'doc/reference/shell/Makefile.am') diff --git a/doc/reference/shell/Makefile.am b/doc/reference/shell/Makefile.am index 52134aba8f..114b0e2bf5 100644 --- a/doc/reference/shell/Makefile.am +++ b/doc/reference/shell/Makefile.am @@ -51,8 +51,8 @@ expand_content_files= GTKDOC_CFLAGS= \ -I$(top_builddir) \ -I$(top_srcdir) \ - $(SHELL_CFLAGS) \ - $(EVOLUTION_DATA_SERVER_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GTKHTML_CFLAGS) GTKDOC_LIBS= \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/e-util/libeutil.la \ @@ -61,8 +61,8 @@ GTKDOC_LIBS= \ $(top_builddir)/smclient/libeggdesktopfile.la \ $(top_builddir)/widgets/menus/libmenus.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(SHELL_LIBS) \ - $(EVOLUTION_DATA_SERVER_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GTKHTML_LIBS) # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.make -- cgit v1.2.3