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



commit 0ccdfdd78a2e22674bc1bc75936465d7b86221c9
Author: Arnel A. Borja <kyoushuu yahoo com>
Date:   Thu Mar 21 23:28:58 2013 +0800

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

 plugins/devhelp/Makefile.am        |    8 +++-----
 plugins/devhelp/images/Makefile.am |    5 +----
 2 files changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/plugins/devhelp/Makefile.am b/plugins/devhelp/Makefile.am
index 9bdf531..e88255b 100644
--- a/plugins/devhelp/Makefile.am
+++ b/plugins/devhelp/Makefile.am
@@ -2,14 +2,14 @@ SUBDIRS = images
 
 # Plugin UI file
 devhelp_uidir = $(anjuta_ui_dir)
-devhelp_ui_DATA = anjuta-devhelp.ui anjuta-devhelp-simple.ui
+dist_devhelp_ui_DATA = anjuta-devhelp.ui anjuta-devhelp-simple.ui
 
 # Plugin description file
 plugin_in_files = anjuta-devhelp.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
 
 devhelp_plugindir = $(anjuta_plugin_dir)
-devhelp_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+dist_devhelp_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
 
 # Include paths
 AM_CPPFLAGS = \
@@ -42,8 +42,6 @@ libanjuta_devhelp_la_LIBADD = \
        $(PLUGIN_DEVHELP_LIBS)
 
 EXTRA_DIST = \
-       $(plugin_in_files) \
-       $(devhelp_plugin_DATA) \
-       $(devhelp_ui_DATA)
+       $(plugin_in_files)
 
 -include $(top_srcdir)/git.mk
diff --git a/plugins/devhelp/images/Makefile.am b/plugins/devhelp/images/Makefile.am
index 8f1ab97..5b581ac 100644
--- a/plugins/devhelp/images/Makefile.am
+++ b/plugins/devhelp/images/Makefile.am
@@ -1,6 +1,6 @@
 # Plugin Icon file
 devhelp_pixmapsdir = $(anjuta_image_dir)
-devhelp_pixmaps_DATA = \
+dist_devhelp_pixmaps_DATA = \
        anjuta-devhelp-plugin.svg \
        anjuta-devhelp-plugin-48.png \
        anjuta-devhelp-search.svg \
@@ -12,7 +12,4 @@ devhelp_pixmaps_DATA = \
        anjuta-devhelp-view-24.png \
        anjuta-devhelp-view-16.png
        
-EXTRA_DIST = \
-       $(devhelp_pixmaps_DATA)
-
 -include $(top_srcdir)/git.mk


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]