[libgd] build-sys: simplify a little bit view-common inclusion

[Marc-Andre Lureau <malureau src gnome org>]

commit 9f1e9dd02f19d6f4135f9cee858865052c313c44
Author: Marc-Andrà Lureau <marcandre lureau gmail com>
Date:   Wed Aug 22 11:32:19 2012 +0200

    build-sys: simplify a little bit view-common inclusion

 Makefile.am |   15 +++++----------
 libgd.m4    |    8 ++++++++
 2 files changed, 13 insertions(+), 10 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 7f63f23..2147abe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,6 +40,7 @@ nodist_libgd_la_SOURCES += $(gtk_hacks_sources)
 EXTRA_DIST += $(gtk_hacks_sources)
 endif
 
+if LIBGD__VIEW_COMMON
 view_common_sources =				\
 	libgd/gd-main-view-generic.c		\
 	libgd/gd-main-view-generic.h		\
@@ -47,6 +48,10 @@ view_common_sources =				\
 	libgd/gd-two-lines-renderer.h		\
 	$(NULL)
 
+nodist_libgd_la_SOURCES += $(view_common_sources)
+EXTRA_DIST += $(view_common_sources)
+endif
+
 if LIBGD_MAIN_ICON_VIEW
 main_icon_view_sources =			\
 	libgd/gd-main-icon-view.c		\
@@ -69,16 +74,6 @@ nodist_libgd_la_SOURCES += $(main_list_view_sources)
 EXTRA_DIST += $(main_list_view_sources)
 endif
 
-if !LIBGD_MAIN_ICON_VIEW
-if LIBGD_MAIN_LIST_VIEW
-nodist_libgd_la_SOURCES += $(view_common_sources)
-EXTRA_DIST += $(view_common_sources)
-endif
-else
-nodist_libgd_la_SOURCES += $(view_common_sources)
-EXTRA_DIST += $(view_common_sources)
-endif
-
 if LIBGD_MAIN_VIEW
 main_view_sources =				\
 	libgd/gd-main-view.c			\
diff --git a/libgd.m4 b/libgd.m4
index 4ef6a97..733b9a6 100644
--- a/libgd.m4
+++ b/libgd.m4
@@ -61,15 +61,23 @@ AC_DEFUN([LIBGD_INIT], [
     # main-icon-view:
     AM_CONDITIONAL([LIBGD_MAIN_ICON_VIEW],[_LIBGD_IF_OPTION_SET([main-icon-view],[true],[false])])
     _LIBGD_IF_OPTION_SET([main-icon-view],[
+        _LIBGD_SET_OPTION([_view-common])
         AC_DEFINE([LIBGD_MAIN_ICON_VIEW], [1], [Description])
     ])
 
     # main-list-view:
     AM_CONDITIONAL([LIBGD_MAIN_LIST_VIEW],[_LIBGD_IF_OPTION_SET([main-list-view],[true],[false])])
     _LIBGD_IF_OPTION_SET([main-list-view],[
+        _LIBGD_SET_OPTION([_view-common])
         AC_DEFINE([LIBGD_MAIN_LIST_VIEW], [1], [Description])
     ])
 
+    # _view-common:
+    AM_CONDITIONAL([LIBGD__VIEW_COMMON],[_LIBGD_IF_OPTION_SET([_view-common],[true],[false])])
+    _LIBGD_IF_OPTION_SET([_view-common],[
+        AC_DEFINE([LIBGD__VIEW_COMMON], [1], [Description])
+    ])
+
     # main-toolbar:
     AM_CONDITIONAL([LIBGD_MAIN_TOOLBAR],[_LIBGD_IF_OPTION_SET([main-toolbar],[true],[false])])
     _LIBGD_IF_OPTION_SET([main-toolbar],[