[gnome-terminal] build: Fix duplicate source reference when search provider is enabled

[Colin Walters <walters src gnome org>]

commit fdd3d33b27a4f5793f887472090d9de158ec9dd2
Author: Colin Walters <walters verbum org>
Date:   Mon Feb 17 17:04:53 2014 -0500

    build: Fix duplicate source reference when search provider is enabled
    
    We get a duplicate inclusion since previously $(BUILT_SOURCES)
    was appended to $(gnome_terminal_server_SOURCES).
    
    This is a bit annoying with Automake - best practice here is to define
    an intermediate variable.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=724584

 src/Makefile.am |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index ff5636a..8050f06 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,7 @@
 NULL =
 
+BUILT_SOURCES =
+
 bin_PROGRAMS = gnome-terminal
 libexec_PROGRAMS = gnome-terminal-server
 noinst_PROGRAMS = gnome-terminal-client
@@ -12,7 +14,7 @@ endif # WITH_NAUTILUS_EXTENSION
 
 dbusservice_DATA = org.gnome.Terminal.service
 
-BUILT_SOURCES = \
+gnome_terminal_server_built = \
        terminal-marshal.c \
        terminal-marshal.h \
        terminal-type-builtins.c \
@@ -22,6 +24,7 @@ BUILT_SOURCES = \
        terminal-resources.c \
        terminal-resources.h \
        $(NULL)
+BUILT_SOURCES += $(gnome_terminal_server_built)
 
 gnome_terminal_server_SOURCES = \
        eggshell.c \
@@ -77,7 +80,7 @@ gnome_terminal_server_SOURCES = \
        terminal-window.h \
        $(NULL)
 
-nodist_gnome_terminal_server_SOURCES = $(BUILT_SOURCES)
+nodist_gnome_terminal_server_SOURCES = $(gnome_terminal_server_built)
 
 gnome_terminal_server_CPPFLAGS = \
        -DTERMINAL_COMPILATION \
@@ -314,7 +317,7 @@ if ENABLE_SEARCH_PROVIDER
 searchproviderdir = $(datadir)/gnome-shell/search-providers
 dist_searchprovider_DATA = gnome-terminal-search-provider.ini
 
-BUILT_SOURCES += \
+gnome_terminal_server_built += \
        terminal-search-provider-gdbus-generated.c \
        terminal-search-provider-gdbus-generated.h \
        $(NULL)
@@ -324,11 +327,6 @@ gnome_terminal_server_SOURCES += \
        terminal-search-provider.h \
        $(NULL)
 
-nodist_gnome_terminal_server_SOURCES += \
-       terminal-search-provider-gdbus-generated.c \
-       terminal-search-provider-gdbus-generated.h \
-       $(NULL)
-
 terminal-search-provider-gdbus-generated.c terminal-search-provider-gdbus-generated.h: 
$(dbusinterfacedir)/org.gnome.ShellSearchProvider2.xml Makefile
        $(AM_V_GEN) $(GDBUS_CODEGEN) \
                        --interface-prefix=org.gnome.Shell \