[anjuta/gnome-3-8] glade: bgo #696023 - Use dist_ prefix instead of EXTRA_DIST

[James Liggett <jrliggett src gnome org>]

commit 21017ce72e31d1707a65ba2ee3c48d50b4608125
Author: Arnel A. Borja <kyoushuu yahoo com>
Date:   Wed Mar 20 21:14:31 2013 +0800

    glade: bgo #696023 - Use dist_ prefix instead of EXTRA_DIST
    
    - Make sure to distribute all files even if the plugin is disabled.

 plugins/glade/Makefile.am        |   18 +++++++-----------
 plugins/glade/images/Makefile.am |    9 +++++----
 2 files changed, 12 insertions(+), 15 deletions(-)
---
diff --git a/plugins/glade/Makefile.am b/plugins/glade/Makefile.am
index e5e701d..630d0f5 100644
--- a/plugins/glade/Makefile.am
+++ b/plugins/glade/Makefile.am
@@ -1,21 +1,21 @@
 SUBDIRS = images
 
+plugin_in_files = anjuta-glade.plugin.in
+%.plugin: %.plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) 
$(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+
 if HAVE_PLUGIN_GLADE
 
 # Plugin glade file
 glade_gladedir = $(anjuta_glade_dir)
-glade_glade_DATA = anjuta-glade.ui
+dist_glade_glade_DATA = anjuta-glade.ui
 
 # Plugin UI file
 glade_uidir = $(anjuta_ui_dir)
-glade_ui_DATA = anjuta-glade.xml
+dist_glade_ui_DATA = anjuta-glade.xml
 
 # Plugin description file
-plugin_in_files = anjuta-glade.plugin.in
-%.plugin: %.plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) 
$(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
 glade_plugindir = $(anjuta_plugin_dir)
-glade_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+dist_glade_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
 
 # Include paths
 AM_CPPFLAGS = \
@@ -44,11 +44,7 @@ libanjuta_glade_la_LIBADD = \
 endif
 
 EXTRA_DIST = \
-       $(plugin_in_files) \
-       $(glade_plugin_DATA) \
-       $(glade_ui_DATA) \
-       $(glade_glade_DATA) \
-       $(glade_pixmaps_DATA)
+       $(plugin_in_files)
 
 
 -include $(top_srcdir)/git.mk
diff --git a/plugins/glade/images/Makefile.am b/plugins/glade/images/Makefile.am
index ddc868f..8eb6640 100644
--- a/plugins/glade/images/Makefile.am
+++ b/plugins/glade/images/Makefile.am
@@ -1,6 +1,8 @@
+if HAVE_PLUGIN_GLADE
+
 # Plugin Icon files
 glade_pixmapsdir = $(anjuta_image_dir)
-glade_pixmaps_DATA = \
+dist_glade_pixmaps_DATA = \
        anjuta-glade-plugin.svg \
        anjuta-glade-plugin-48.png \
        anjuta-glade-palette-16.png \
@@ -9,8 +11,7 @@ glade_pixmaps_DATA = \
        anjuta-glade-widgets-16.png \
        anjuta-glade-widgets-24.png \
        anjuta-glade-widgets.svg
-       
-EXTRA_DIST = \
-       $(glade_pixmaps_DATA)
+
+endif
 
 -include $(top_srcdir)/git.mk