[anjuta] bgo #696023 - Use dist_ prefix in Makefiles
- From: James Liggett <jrliggett src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [anjuta] bgo #696023 - Use dist_ prefix in Makefiles
- Date: Sun, 7 Apr 2013 06:42:58 +0000 (UTC)
commit d0b9dfe5fd14f8ea4d1e32d4262e1e6b3a416447
Author: Arnel A. Borja <kyoushuu yahoo com>
Date: Mon Apr 1 10:29:22 2013 +0800
bgo #696023 - Use dist_ prefix in Makefiles
- Add the dist_ prefix to _DATA and _SCRIPTS primaries instead of adding them
twice to their primary and EXTRA_DIST.
- Remove some unnecessary additions to EXTRA_DIST.
data/Makefile.am | 6 ++----
data/templates/Makefile.am | 8 ++------
doc/Makefile.am | 4 ++--
libanjuta/Makefile.am | 6 ++----
mime/Makefile.am | 7 ++-----
pixmaps/16x16/Makefile.am | 6 ++----
pixmaps/22x22/Makefile.am | 6 ++----
pixmaps/24x24/Makefile.am | 6 ++----
pixmaps/32x32/Makefile.am | 6 ++----
pixmaps/48x48/Makefile.am | 6 ++----
pixmaps/Makefile.am | 9 ++-------
pixmaps/scalable/Makefile.am | 6 ++----
plugins/am-project/Makefile.am | 12 ++++--------
plugins/build-basic-autotools/Makefile.am | 15 +++++----------
plugins/class-gen/Makefile.am | 11 ++++-------
plugins/class-gen/templates/Makefile.am | 5 +----
plugins/cvs-plugin/Makefile.am | 12 ++++--------
plugins/debug-manager/Makefile.am | 9 +++------
plugins/debug-manager/images/Makefile.am | 4 +---
plugins/dir-project/Makefile.am | 17 ++++++-----------
plugins/document-manager/Makefile.am | 10 +++-------
plugins/document-manager/images/Makefile.am | 4 +---
plugins/file-loader/Makefile.am | 11 ++++-------
plugins/file-manager/Makefile.am | 12 ++++--------
plugins/file-wizard/Makefile.am | 11 ++++-------
plugins/gdb/Makefile.am | 17 ++++++-----------
plugins/gdb/images/Makefile.am | 4 +---
plugins/git/Makefile.am | 8 +++-----
plugins/git/images/Makefile.am | 5 +----
plugins/indentation-c-style/Makefile.am | 12 ++++--------
plugins/indentation-python-style/Makefile.am | 12 ++++--------
plugins/jhbuild/Makefile.am | 8 +++-----
plugins/js-debugger/Makefile.am | 8 +++-----
plugins/language-manager/Makefile.am | 9 +++------
plugins/language-support-cpp-java/Makefile.am | 12 ++++--------
plugins/language-support-js/Makefile.am | 14 +++++---------
plugins/language-support-python/Makefile.am | 15 +++++----------
plugins/message-view/Makefile.am | 12 ++++--------
plugins/mk-project/Makefile.am | 12 ++++--------
plugins/parser-cxx/Makefile.am | 9 +++------
plugins/patch/Makefile.am | 14 +++++---------
plugins/project-import/Makefile.am | 12 ++++--------
plugins/project-manager/Makefile.am | 12 ++++--------
plugins/project-wizard/Makefile.am | 14 +++++---------
plugins/project-wizard/templates/Makefile.am | 4 ++--
.../templates/anjuta-plugin/Makefile.am | 4 +---
.../templates/anjuta-plugin/po/Makefile.am | 3 +--
.../templates/anjuta-plugin/src/Makefile.am | 4 +---
plugins/project-wizard/templates/cpp/Makefile.am | 4 +---
.../project-wizard/templates/cpp/po/Makefile.am | 3 +--
.../project-wizard/templates/cpp/src/Makefile.am | 4 +---
.../project-wizard/templates/directory/Makefile.am | 4 +---
plugins/project-wizard/templates/gcj/Makefile.am | 4 +---
.../project-wizard/templates/gcj/src/Makefile.am | 3 +--
.../templates/gnome-shell-extension/Makefile.am | 3 +--
.../gnome-shell-extension/src/Makefile.am | 3 +--
.../project-wizard/templates/gtk/po/Makefile.am | 3 +--
.../project-wizard/templates/gtk/src/Makefile.am | 3 +--
.../templates/gtkapplication/po/Makefile.am | 3 +--
.../templates/gtkapplication/src/Makefile.am | 3 +--
plugins/project-wizard/templates/gtkmm/Makefile.am | 4 +---
.../project-wizard/templates/gtkmm/po/Makefile.am | 3 +--
.../project-wizard/templates/gtkmm/src/Makefile.am | 3 +--
plugins/project-wizard/templates/java/Makefile.am | 5 +----
.../project-wizard/templates/java/po/Makefile.am | 3 +--
.../project-wizard/templates/java/src/Makefile.am | 3 +--
.../templates/js_minimal/Makefile.am | 4 +---
.../templates/js_minimal/src/Makefile.am | 3 +--
.../project-wizard/templates/library/Makefile.am | 4 +---
.../templates/library/po/Makefile.am | 3 +--
.../templates/library/src/Makefile.am | 3 +--
plugins/project-wizard/templates/m4/Makefile.am | 4 +---
.../project-wizard/templates/minimal/Makefile.am | 4 +---
.../project-wizard/templates/mkfile/Makefile.am | 4 +---
.../project-wizard/templates/mkfile/po/Makefile.am | 3 +--
.../templates/mkfile/src/Makefile.am | 3 +--
plugins/project-wizard/templates/pygtk/Makefile.am | 5 +----
.../project-wizard/templates/pygtk/po/Makefile.am | 3 +--
.../project-wizard/templates/pygtk/src/Makefile.am | 3 +--
.../project-wizard/templates/python/Makefile.am | 4 +---
.../project-wizard/templates/python/po/Makefile.am | 3 +--
.../templates/python/src/Makefile.am | 3 +--
plugins/project-wizard/templates/sdl/Makefile.am | 4 +---
.../project-wizard/templates/sdl/po/Makefile.am | 3 +--
.../project-wizard/templates/sdl/src/Makefile.am | 3 +--
.../project-wizard/templates/terminal/Makefile.am | 4 +---
.../templates/terminal/po/Makefile.am | 4 +---
.../templates/terminal/src/Makefile.am | 4 +---
.../project-wizard/templates/vala-gtk/Makefile.am | 4 +---
.../templates/vala-gtk/src/Makefile.am | 3 +--
plugins/project-wizard/templates/wxwin/Makefile.am | 4 +---
.../project-wizard/templates/wxwin/po/Makefile.am | 3 +--
.../project-wizard/templates/wxwin/src/Makefile.am | 3 +--
.../templates/xlib-dock/po/Makefile.am | 3 +--
.../templates/xlib-dock/src/Makefile.am | 3 +--
plugins/project-wizard/templates/xlib/Makefile.am | 4 +---
.../project-wizard/templates/xlib/po/Makefile.am | 3 +--
.../project-wizard/templates/xlib/src/Makefile.am | 3 +--
plugins/quick-open/Makefile.am | 12 ++++--------
plugins/run-program/Makefile.am | 12 ++++--------
plugins/snippets-manager/Makefile.am | 15 +++++----------
plugins/sourceview/Makefile.am | 12 ++++--------
plugins/starter/Makefile.am | 4 +---
plugins/symbol-db/Makefile.am | 15 +++++----------
plugins/terminal/Makefile.am | 12 ++++--------
plugins/tools/Makefile.am | 12 ++++--------
plugins/tools/scripts/Makefile.am | 6 ++----
scripts/Makefile.am | 4 +---
src/Makefile.am | 13 ++++---------
109 files changed, 232 insertions(+), 490 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 10422e4..2e6d7e9 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -9,10 +9,8 @@ SUBDIRS = templates
anjuta_datadir = $(anjuta_data_dir)
anjuta_profiledir = $(anjuta_data_dir)/profiles
-anjuta_data_DATA = welcome.txt
+dist_anjuta_data_DATA = welcome.txt
-anjuta_profile_DATA = default.profile
-
-EXTRA_DIST = $(anjuta_data_DATA) $(anjuta_profile_DATA)
+dist_anjuta_profile_DATA = default.profile
-include $(top_srcdir)/git.mk
diff --git a/data/templates/Makefile.am b/data/templates/Makefile.am
index c3a65d3..bd29b80 100644
--- a/data/templates/Makefile.am
+++ b/data/templates/Makefile.am
@@ -1,10 +1,10 @@
# Templates
template_datadir = $(anjuta_data_dir)/templates
-template_data_DATA = \
+dist_template_data_DATA = \
indent.tpl
licenses_datadir = $(template_datadir)/licenses
-licenses_data_DATA = \
+dist_licenses_data_DATA = \
licenses/gpl.txt \
licenses/gpl.tpl \
licenses/lgpl.txt \
@@ -14,8 +14,4 @@ licenses_data_DATA = \
licenses/none.txt \
licenses/none.tpl
-EXTRA_DIST = \
- $(template_data_DATA) \
- $(licenses_data_DATA)
-
-include $(top_srcdir)/git.mk
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 07e4bbf..b4efbec 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -9,10 +9,10 @@ anjuta_docdir = $(docdir)
anjuta_doc_DATA = \
ScintillaDoc.html
-man_MANS = \
+dist_man_MANS = \
anjuta.1 \
anjuta-launcher.1
-EXTRA_DIST = $(anjuta_doc_DATA) $(man_MANS)
+EXTRA_DIST = $(anjuta_doc_DATA)
-include $(top_srcdir)/git.mk
diff --git a/libanjuta/Makefile.am b/libanjuta/Makefile.am
index e268ba6..2b53c13 100644
--- a/libanjuta/Makefile.am
+++ b/libanjuta/Makefile.am
@@ -150,7 +150,7 @@ libgladeanjuta_la_LIBADD = \
catalogdir = @GLADE_CATALOG_PATH@
-catalog_DATA = anjuta-glade.xml
+dist_catalog_DATA = anjuta-glade.xml
endif
@@ -262,10 +262,8 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libanjuta-3.0.pc
EXTRA_DIST = \
- $(libanjutainclude_HEADERS) \
libanjuta-3.0.pc.in \
- anjuta-marshal.list \
- $(catalog_DATA)
+ anjuta-marshal.list
DISTCLEANFILES = \
anjuta-enum-types.h \
diff --git a/mime/Makefile.am b/mime/Makefile.am
index cec113c..5da230e 100644
--- a/mime/Makefile.am
+++ b/mime/Makefile.am
@@ -1,12 +1,9 @@
mimexmldir = $(datadir)/mime/packages
-mimexml_DATA = anjuta.xml
-
-EXTRA_DIST = \
- $(mimexml_DATA)
+dist_mimexml_DATA = anjuta.xml
## Update mime only when system wide installation takes place
-install-data-local: install-mimexmlDATA
+install-data-local: install-dist_mimexmlDATA
if [ -f $(DESTDIR)$(datadir)/mime/packages/freedesktop.org.xml ] ; then \
if which update-mime-database>/dev/null 2>&1; then \
update-mime-database $(DESTDIR)$(datadir)/mime; \
diff --git a/pixmaps/16x16/Makefile.am b/pixmaps/16x16/Makefile.am
index 9f4f94a..dc66392 100644
--- a/pixmaps/16x16/Makefile.am
+++ b/pixmaps/16x16/Makefile.am
@@ -1,9 +1,7 @@
icondir = $(datadir)/icons/hicolor/16x16/apps
-icon_DATA = anjuta.png
+dist_icon_DATA = anjuta.png
mimepngicondir = $(datadir)/icons/gnome/16x16/mimetypes
-mimepngicon_DATA = gnome-mime-application-x-anjuta.png
-
-EXTRA_DIST = $(icon_DATA) $(mimepngicon_DATA)
+dist_mimepngicon_DATA = gnome-mime-application-x-anjuta.png
-include $(top_srcdir)/git.mk
diff --git a/pixmaps/22x22/Makefile.am b/pixmaps/22x22/Makefile.am
index f44ec5d..b5d782d 100644
--- a/pixmaps/22x22/Makefile.am
+++ b/pixmaps/22x22/Makefile.am
@@ -1,9 +1,7 @@
icondir = $(datadir)/icons/hicolor/22x22/apps
-icon_DATA = anjuta.png
+dist_icon_DATA = anjuta.png
mimepngicondir = $(datadir)/icons/gnome/22x22/mimetypes
-mimepngicon_DATA = gnome-mime-application-x-anjuta.png
-
-EXTRA_DIST = $(icon_DATA) $(mimepngicon_DATA)
+dist_mimepngicon_DATA = gnome-mime-application-x-anjuta.png
-include $(top_srcdir)/git.mk
diff --git a/pixmaps/24x24/Makefile.am b/pixmaps/24x24/Makefile.am
index 7a4b6d4..7b9cb86 100644
--- a/pixmaps/24x24/Makefile.am
+++ b/pixmaps/24x24/Makefile.am
@@ -1,9 +1,7 @@
icondir = $(datadir)/icons/hicolor/24x24/apps
-icon_DATA = anjuta.png
+dist_icon_DATA = anjuta.png
mimepngicondir = $(datadir)/icons/gnome/24x24/mimetypes
-mimepngicon_DATA = gnome-mime-application-x-anjuta.png
-
-EXTRA_DIST = $(icon_DATA) $(mimepngicon_DATA)
+dist_mimepngicon_DATA = gnome-mime-application-x-anjuta.png
-include $(top_srcdir)/git.mk
diff --git a/pixmaps/32x32/Makefile.am b/pixmaps/32x32/Makefile.am
index 3388560..697fdda 100644
--- a/pixmaps/32x32/Makefile.am
+++ b/pixmaps/32x32/Makefile.am
@@ -1,9 +1,7 @@
icondir = $(datadir)/icons/hicolor/32x32/apps
-icon_DATA = anjuta.png
+dist_icon_DATA = anjuta.png
mimepngicondir = $(datadir)/icons/gnome/32x32/mimetypes
-mimepngicon_DATA = gnome-mime-application-x-anjuta.png
-
-EXTRA_DIST = $(icon_DATA) $(mimepngicon_DATA)
+dist_mimepngicon_DATA = gnome-mime-application-x-anjuta.png
-include $(top_srcdir)/git.mk
diff --git a/pixmaps/48x48/Makefile.am b/pixmaps/48x48/Makefile.am
index e22665c..96c0ad7 100644
--- a/pixmaps/48x48/Makefile.am
+++ b/pixmaps/48x48/Makefile.am
@@ -1,9 +1,7 @@
icondir = $(datadir)/icons/hicolor/48x48/apps
-icon_DATA = anjuta.png
+dist_icon_DATA = anjuta.png
mimepngicondir = $(datadir)/icons/gnome/48x48/mimetypes
-mimepngicon_DATA = gnome-mime-application-x-anjuta.png
-
-EXTRA_DIST = $(icon_DATA) $(mimepngicon_DATA)
+dist_mimepngicon_DATA = gnome-mime-application-x-anjuta.png
-include $(top_srcdir)/git.mk
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index 3311b76..71ad381 100644
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -15,7 +15,7 @@ update-icon-cache:
anjuta_pixmapsdir = $(anjuta_image_dir)
-anjuta_pixmaps_DATA = \
+dist_anjuta_pixmaps_DATA = \
madeinanjuta.xcf \
anjuta_logo.png \
anjuta_splash.png \
@@ -25,15 +25,10 @@ anjuta_pixmaps_DATA = \
start-with-import.png
anjuta_glade_pixmapsdir = $(anjuta_glade_dir)
-anjuta_glade_pixmaps_DATA = \
+dist_anjuta_glade_pixmaps_DATA = \
start-with-wizard.png \
start-with-import.png \
start-with-open.png
-EXTRA_DIST = $(anjuta_pixmaps_DATA) \
- $(anjuta_glade_pixmaps_DATA) \
- $(icon_DATA) \
- $(svgicon_DATA)
-
-include $(top_srcdir)/git.mk
diff --git a/pixmaps/scalable/Makefile.am b/pixmaps/scalable/Makefile.am
index afec0dc..9252169 100644
--- a/pixmaps/scalable/Makefile.am
+++ b/pixmaps/scalable/Makefile.am
@@ -1,9 +1,7 @@
svgicondir = $(datadir)/icons/hicolor/scalable/apps
-svgicon_DATA = anjuta.svg
+dist_svgicon_DATA = anjuta.svg
mimesvgicondir = $(datadir)/icons/gnome/scalable/mimetypes
-mimesvgicon_DATA = gnome-mime-application-x-anjuta.svg
-
-EXTRA_DIST = $(svgicon_DATA) $(mimesvgicon_DATA)
+dist_mimesvgicon_DATA = gnome-mime-application-x-anjuta.svg
-include $(top_srcdir)/git.mk
diff --git a/plugins/am-project/Makefile.am b/plugins/am-project/Makefile.am
index 1416235..b5f5f5d 100644
--- a/plugins/am-project/Makefile.am
+++ b/plugins/am-project/Makefile.am
@@ -2,22 +2,22 @@ SUBDIRS = . tests
# Plugin UI file
plugin_uidir = $(anjuta_ui_dir)
-plugin_ui_DATA =
+dist_plugin_ui_DATA =
# Plugin glade file
plugin_gladedir = $(anjuta_glade_dir)
-plugin_glade_DATA =
+dist_plugin_glade_DATA =
# Plugin icon file
plugin_pixmapsdir = $(anjuta_image_dir)
-plugin_pixmaps_DATA = am-project-plugin-48.png
+dist_plugin_pixmaps_DATA = am-project-plugin-48.png
# Plugin description file
plugin_in_files = am-project.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
plugindir = $(anjuta_plugin_dir)
-plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+dist_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
AM_CPPFLAGS = \
$(WARN_CFLAGS) \
@@ -108,10 +108,6 @@ projectparser_LDADD = \
EXTRA_DIST = \
$(plugin_in_files) \
- $(plugin_DATA) \
- $(plugin_ui_DATA) \
- $(plugin_pixmaps_DATA) \
- $(plugin_glade_DATA) \
ac-parser.h \
am-parser.h
diff --git a/plugins/build-basic-autotools/Makefile.am b/plugins/build-basic-autotools/Makefile.am
index 642013a..b91dda2 100644
--- a/plugins/build-basic-autotools/Makefile.am
+++ b/plugins/build-basic-autotools/Makefile.am
@@ -1,15 +1,15 @@
# Plugin glade file
build_gladedir = $(anjuta_glade_dir)
-build_glade_DATA = anjuta-build-basic-autotools-plugin.ui
+dist_build_glade_DATA = anjuta-build-basic-autotools-plugin.ui
# Plugin UI file
build_uidir = $(anjuta_ui_dir)
-build_ui_DATA = anjuta-build-basic-autotools-plugin.xml
+dist_build_ui_DATA = anjuta-build-basic-autotools-plugin.xml
# Plugin Icon file
build_pixmapsdir = $(anjuta_image_dir)
-build_pixmaps_DATA = \
+dist_build_pixmaps_DATA = \
anjuta-build-basic-autotools-plugin-48.png \
anjuta-build-basic-autotools-plugin.svg \
anjuta-build-16.png \
@@ -20,11 +20,11 @@ plugin_in_files = anjuta-build-basic-autotools.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
build_plugindir = $(anjuta_plugin_dir)
-build_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+dist_build_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
# Plugin data files
build_datadir = $(anjuta_data_dir)/build
-build_data_DATA = automake-c.filters
+dist_build_data_DATA = automake-c.filters
# Include paths
AM_CPPFLAGS = \
@@ -67,11 +67,6 @@ gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
EXTRA_DIST = \
$(plugin_in_files) \
- $(build_plugin_DATA) \
- $(build_ui_DATA) \
- $(build_pixmaps_DATA) \
- $(build_glade_DATA) \
- $(build_data_DATA) \
$(gsettings_in_file)
CLEANFILES = \
diff --git a/plugins/class-gen/Makefile.am b/plugins/class-gen/Makefile.am
index 9ce807b..8cff8ec 100644
--- a/plugins/class-gen/Makefile.am
+++ b/plugins/class-gen/Makefile.am
@@ -1,6 +1,6 @@
# Plugin glade file
clsgen_gladedir = $(anjuta_glade_dir)
-clsgen_glade_DATA = anjuta-class-gen-plugin.ui
+dist_clsgen_glade_DATA = anjuta-class-gen-plugin.ui
# Templates
SUBDIRS = templates
@@ -12,12 +12,12 @@ plugin_in_files = anjuta-class-gen.plugin.in
# Plugin pixmaps
clsgen_pixmapsdir = $(anjuta_image_dir)
-clsgen_pixmaps_DATA = \
+dist_clsgen_pixmaps_DATA = \
anjuta-class-gen-plugin.svg \
anjuta-class-gen-plugin-48.png
clsgen_plugindir = $(anjuta_plugin_dir)
-clsgen_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+dist_clsgen_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
plugindir = $(anjuta_plugin_dir)
plugin_LTLIBRARIES = libanjuta-class-gen.la
@@ -53,9 +53,6 @@ libanjuta_class_gen_la_SOURCES= \
window.h
EXTRA_DIST = \
- $(plugin_in_files) \
- $(clsgen_pixmaps_DATA) \
- $(clsgen_glade_DATA) \
- $(clsgen_plugin_DATA)
+ $(plugin_in_files)
-include $(top_srcdir)/git.mk
diff --git a/plugins/class-gen/templates/Makefile.am b/plugins/class-gen/templates/Makefile.am
index a4e7401..ea882be 100644
--- a/plugins/class-gen/templates/Makefile.am
+++ b/plugins/class-gen/templates/Makefile.am
@@ -1,6 +1,6 @@
# Templates
clsgen_appdatadir = $(anjuta_data_dir)/class-templates
-clsgen_appdata_DATA = \
+dist_clsgen_appdata_DATA = \
cc-header.tpl \
cc-source.tpl \
go-header.tpl \
@@ -9,7 +9,4 @@ clsgen_appdata_DATA = \
py-source.tpl \
vala-source.tpl
-EXTRA_DIST = \
- $(clsgen_appdata_DATA)
-
-include $(top_srcdir)/git.mk
diff --git a/plugins/cvs-plugin/Makefile.am b/plugins/cvs-plugin/Makefile.am
index db201dd..b6d4f0e 100644
--- a/plugins/cvs-plugin/Makefile.am
+++ b/plugins/cvs-plugin/Makefile.am
@@ -1,20 +1,20 @@
# Plugin glade file
cvs_plugin_gladedir = $(anjuta_glade_dir)
-cvs_plugin_glade_DATA = anjuta-cvs-plugin.ui
+dist_cvs_plugin_glade_DATA = anjuta-cvs-plugin.ui
cvs_plugin_pixmapsdir = $(anjuta_image_dir)
-cvs_plugin_pixmaps_DATA = \
+dist_cvs_plugin_pixmaps_DATA = \
anjuta-cvs-plugin.svg \
anjuta-cvs-plugin-48.png
cvs_plugin_uidir = $(anjuta_ui_dir)
-cvs_plugin_ui_DATA = anjuta-cvs.ui
+dist_cvs_plugin_ui_DATA = anjuta-cvs.ui
plugin_in_files = anjuta-cvs.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
cvs_plugin_plugindir = $(anjuta_plugin_dir)
-cvs_plugin_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+dist_cvs_plugin_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
AM_CPPFLAGS= \
$(WARN_CFLAGS) \
@@ -49,10 +49,6 @@ gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
EXTRA_DIST = \
$(plugin_in_files) \
- $(cvs_plugin_pixmaps_DATA) \
- $(cvs_plugin_plugin_DATA) \
- $(cvs_plugin_ui_DATA) \
- $(cvs_plugin_glade_DATA) \
$(gsettings_in_file)
CLEANFILES = \
diff --git a/plugins/debug-manager/Makefile.am b/plugins/debug-manager/Makefile.am
index ef7e958..751d63a 100644
--- a/plugins/debug-manager/Makefile.am
+++ b/plugins/debug-manager/Makefile.am
@@ -1,9 +1,9 @@
# Plugin glade file
anjuta_gladedir = $(anjuta_glade_dir)
-anjuta_glade_DATA = anjuta-debug-manager.ui
+dist_anjuta_glade_DATA = anjuta-debug-manager.ui
anjuta_uidir = $(anjuta_ui_dir)
-anjuta_ui_DATA = anjuta-debug-manager.xml
+dist_anjuta_ui_DATA = anjuta-debug-manager.xml
gsettings_in_files = org.gnome.anjuta.plugins.debug-manager.gschema.xml.in
gsettings_SCHEMAS = $(gsettings_in_files:.xml.in=.xml)
@@ -14,7 +14,7 @@ plugin_in_files = anjuta-debug-manager.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
anjuta_plugindir = $(anjuta_plugin_dir)
-anjuta_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+dist_anjuta_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
AM_CPPFLAGS= \
$(WARN_CFLAGS) \
@@ -91,10 +91,7 @@ libanjuta_debug_manager_la_SOURCES = \
EXTRA_DIST = \
$(plugin_in_files) \
- $(anjuta_plugin_DATA) \
$(schema_in_files) \
- $(anjuta_ui_DATA) \
- $(anjuta_glade_DATA) \
$(gsettings_in_files) \
anjuta-marshal.list
diff --git a/plugins/debug-manager/images/Makefile.am b/plugins/debug-manager/images/Makefile.am
index 4b3010f..7165aa9 100644
--- a/plugins/debug-manager/images/Makefile.am
+++ b/plugins/debug-manager/images/Makefile.am
@@ -1,7 +1,7 @@
## File created by the gnome-build tools
imagesdir = $(anjuta_image_dir)
-images_DATA = \
+dist_images_DATA = \
anjuta-attach-16.png \
anjuta-attach-24.png \
anjuta-step-into-16.png \
@@ -33,6 +33,4 @@ images_DATA = \
anjuta-memory-24.png \
anjuta-memory.svg
-EXTRA_DIST = $(images_DATA)
-
-include $(top_srcdir)/git.mk
diff --git a/plugins/dir-project/Makefile.am b/plugins/dir-project/Makefile.am
index 8a1b5a3..10d7343 100644
--- a/plugins/dir-project/Makefile.am
+++ b/plugins/dir-project/Makefile.am
@@ -1,25 +1,25 @@
# Plugin UI file
plugin_uidir = $(anjuta_ui_dir)
-plugin_ui_DATA =
+dist_plugin_ui_DATA =
# Plugin glade file
plugin_gladedir = $(anjuta_glade_dir)
-plugin_glade_DATA =
+dist_plugin_glade_DATA =
# Plugin data file
plugin_datadir = $(anjuta_data_dir)
-plugin_data_DATA = sources.list
+dist_plugin_data_DATA = sources.list
# Plugin icon file
plugin_pixmapsdir = $(anjuta_image_dir)
-plugin_pixmaps_DATA = dir-project-plugin-48.png
+dist_plugin_pixmaps_DATA = dir-project-plugin-48.png
# Plugin description file
plugin_in_files = dir-project.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
plugindir = $(anjuta_plugin_dir)
-plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+dist_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
AM_CPPFLAGS = \
$(WARN_CFLAGS) \
@@ -47,12 +47,7 @@ libdir_project_la_LIBADD = \
EXTRA_DIST = \
- $(plugin_in_files) \
- $(plugin_DATA) \
- $(plugin_ui_DATA) \
- $(plugin_pixmaps_DATA) \
- $(plugin_glade_DATA) \
- $(plugin_data_DATA)
+ $(plugin_in_files)
DISTCLEANFILES = \
$(plugin_DATA)
diff --git a/plugins/document-manager/Makefile.am b/plugins/document-manager/Makefile.am
index b670d71..1a88cdb 100644
--- a/plugins/document-manager/Makefile.am
+++ b/plugins/document-manager/Makefile.am
@@ -2,18 +2,18 @@ SUBDIRS = images
# Plugin glade file
document_manager_gladedir = $(anjuta_glade_dir)
-document_manager_glade_DATA = anjuta-document-manager.ui
+dist_document_manager_glade_DATA = anjuta-document-manager.ui
# Plugin UI file
document_manager_uidir = $(anjuta_ui_dir)
-document_manager_ui_DATA = anjuta-document-manager.xml
+dist_document_manager_ui_DATA = anjuta-document-manager.xml
# Plugin file
plugin_in_files = anjuta-document-manager.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
document_manager_plugindir = $(anjuta_plugin_dir)
-document_manager_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+dist_document_manager_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
plugindir = $(anjuta_plugin_dir)
plugin_LTLIBRARIES = libanjuta-document-manager.la
@@ -60,11 +60,7 @@ gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
@GSETTINGS_RULES@
EXTRA_DIST = \
- $(document_manager_pixmaps_DATA) \
$(plugin_in_files) \
- $(document_manager_plugin_DATA) \
- $(document_manager_ui_DATA) \
- $(document_manager_glade_DATA) \
$(gsettings_in_file)
CLEANFILES = \
diff --git a/plugins/document-manager/images/Makefile.am b/plugins/document-manager/images/Makefile.am
index 5bc5650..0bde577 100644
--- a/plugins/document-manager/images/Makefile.am
+++ b/plugins/document-manager/images/Makefile.am
@@ -1,5 +1,5 @@
document_manager_pixmapsdir = $(anjuta_image_dir)
-document_manager_pixmaps_DATA = \
+dist_document_manager_pixmaps_DATA = \
anjuta-document-manager-plugin.svg \
anjuta-document-manager-plugin-48.png \
preferences-editor.png \
@@ -44,7 +44,5 @@ document_manager_pixmaps_DATA = \
anjuta-complete-auto-16.png \
anjuta-complete-auto-24.png
-EXTRA_DIST = $(document_manager_pixmaps_DATA)
-
-include $(top_srcdir)/git.mk
diff --git a/plugins/file-loader/Makefile.am b/plugins/file-loader/Makefile.am
index 065cf13..4382c13 100644
--- a/plugins/file-loader/Makefile.am
+++ b/plugins/file-loader/Makefile.am
@@ -1,10 +1,10 @@
# Plugin UI file
loader_uidir = $(anjuta_ui_dir)
-loader_ui_DATA = anjuta-loader-plugin.ui
+dist_loader_ui_DATA = anjuta-loader-plugin.ui
# Plugin Icon file
loader_pixmapsdir = $(anjuta_image_dir)
-loader_pixmaps_DATA = \
+dist_loader_pixmaps_DATA = \
anjuta-loader-plugin.svg \
anjuta-loader-plugin-48.png
@@ -13,7 +13,7 @@ plugin_in_files = anjuta-loader.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
loader_plugindir = $(anjuta_plugin_dir)
-loader_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+dist_loader_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
# Include paths
AM_CPPFLAGS = \
@@ -45,9 +45,6 @@ libanjuta_loader_la_LIBADD = \
# Plugin dependencies
EXTRA_DIST = \
- $(plugin_in_files) \
- $(loader_plugin_DATA) \
- $(loader_ui_DATA) \
- $(loader_pixmaps_DATA)
+ $(plugin_in_files)
-include $(top_srcdir)/git.mk
diff --git a/plugins/file-manager/Makefile.am b/plugins/file-manager/Makefile.am
index 4e7ba5a..1d86aeb 100644
--- a/plugins/file-manager/Makefile.am
+++ b/plugins/file-manager/Makefile.am
@@ -1,14 +1,14 @@
# Plugin glade file
file_manager_gladedir = $(anjuta_glade_dir)
-file_manager_glade_DATA = file-manager.ui
+dist_file_manager_glade_DATA = file-manager.ui
# Plugin UI file
file_manager_uidir = $(anjuta_ui_dir)
-file_manager_ui_DATA = file-manager.xml
+dist_file_manager_ui_DATA = file-manager.xml
# Plugin Icon file
file_manager_pixmapsdir = $(anjuta_image_dir)
-file_manager_pixmaps_DATA = \
+dist_file_manager_pixmaps_DATA = \
anjuta-file-manager-plugin.svg \
anjuta-file-manager-plugin-48.png \
anjuta-file-manager-plugin-16.png \
@@ -25,7 +25,7 @@ plugin_in_files = file-manager.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
file_manager_plugindir = $(anjuta_plugin_dir)
-file_manager_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+dist_file_manager_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
# Include paths
AM_CPPFLAGS = \
@@ -80,10 +80,6 @@ gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
EXTRA_DIST = \
$(plugin_in_files) \
- $(file_manager_plugin_DATA) \
- $(file_manager_ui_DATA) \
- $(file_manager_pixmaps_DATA) \
- $(file_manager_glade_DATA) \
file-view-marshal.list \
$(gsettings_in_file)
diff --git a/plugins/file-wizard/Makefile.am b/plugins/file-wizard/Makefile.am
index ee06ba6..51eeb74 100644
--- a/plugins/file-wizard/Makefile.am
+++ b/plugins/file-wizard/Makefile.am
@@ -1,10 +1,10 @@
# Plugin glade file
wizard_gladedir = $(anjuta_glade_dir)
-wizard_glade_DATA = anjuta-file-wizard.ui
+dist_wizard_glade_DATA = anjuta-file-wizard.ui
# Plugin pixmaps
wizard_pixmapsdir = $(anjuta_image_dir)
-wizard_pixmaps_DATA = \
+dist_wizard_pixmaps_DATA = \
anjuta-file-wizard-plugin.svg \
anjuta-file-wizard-plugin-48.png
@@ -13,7 +13,7 @@ plugin_in_files = anjuta-file-wizard.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
wizard_plugindir = $(anjuta_plugin_dir)
-wizard_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+dist_wizard_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
plugindir = $(anjuta_plugin_dir)
plugin_LTLIBRARIES = libanjuta-file-wizard.la
@@ -36,9 +36,6 @@ libanjuta_file_wizard_la_SOURCES= \
plugin.h
EXTRA_DIST = \
- $(plugin_in_files) \
- $(wizard_pixmaps_DATA) \
- $(wizard_plugin_DATA) \
- $(wizard_glade_DATA)
+ $(plugin_in_files)
-include $(top_srcdir)/git.mk
diff --git a/plugins/gdb/Makefile.am b/plugins/gdb/Makefile.am
index 652c3a2..1eefec6 100644
--- a/plugins/gdb/Makefile.am
+++ b/plugins/gdb/Makefile.am
@@ -1,16 +1,16 @@
# Plugin UI file
gdb_uidir = $(anjuta_ui_dir)
-gdb_ui_DATA =
+dist_gdb_ui_DATA =
# Plugin glade file
anjuta_gladedir = $(anjuta_glade_dir)
-anjuta_glade_DATA = anjuta-gdb.ui
+dist_anjuta_glade_DATA = anjuta-gdb.ui
anjuta_datadir = $(anjuta_data_dir)
-anjuta_data_DATA = gdb.init
+dist_anjuta_data_DATA = gdb.init
plugin_pixmapsdir = $(anjuta_image_dir)
-plugin_pixmaps_DATA = \
+dist_plugin_pixmaps_DATA = \
anjuta-gdb.plugin.png \
pointer.png
@@ -18,7 +18,7 @@ plugin_in_files = anjuta-gdb.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
anjuta_plugindir = $(anjuta_plugin_dir)
-anjuta_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+dist_anjuta_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
AM_CPPFLAGS= \
$(WARN_CFLAGS) \
@@ -58,12 +58,7 @@ gdbmi_test_LDADD = $(GTK_LIBS) $(LIBANJUTA_LIBS) $(XML_LIBS) $(ANJUTA_LIBS)
gdbmi_test_CFLAGS = $(AM_CFLAGS)
EXTRA_DIST = \
- $(plugin_pixmaps_DATA) \
- $(plugin_in_files) \
- $(anjuta_plugin_DATA) \
- $(gdb_ui_DATA) \
- $(anjuta_glade_DATA) \
- $(anjuta_data_DATA)
+ $(plugin_in_files)
SUBDIRS = \
images
diff --git a/plugins/gdb/images/Makefile.am b/plugins/gdb/images/Makefile.am
index 75a1e54..e24efda 100644
--- a/plugins/gdb/images/Makefile.am
+++ b/plugins/gdb/images/Makefile.am
@@ -1,11 +1,9 @@
## File created by the gnome-build tools
imagesdir = $(anjuta_image_dir)
-images_DATA = \
+dist_images_DATA = \
breakpoint.png \
locals.png \
stack.png
-EXTRA_DIST = $(images_DATA)
-
-include $(top_srcdir)/git.mk
diff --git a/plugins/git/Makefile.am b/plugins/git/Makefile.am
index f821d38..c77c9bb 100644
--- a/plugins/git/Makefile.am
+++ b/plugins/git/Makefile.am
@@ -2,14 +2,14 @@ SUBDIRS = images
# Plugin glade file
git_gladedir = $(anjuta_glade_dir)
-git_glade_DATA = anjuta-git.ui
+dist_git_glade_DATA = anjuta-git.ui
# Plugin description file
plugin_in_files = git.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
git_plugindir = $(anjuta_plugin_dir)
-git_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+dist_git_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
# NOTE :
# The naming convention is very intentional
@@ -239,10 +239,8 @@ gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
@GSETTINGS_RULES@
EXTRA_DIST = \
- $(git_glade_DATA) \
- $(git_plugin_DATA) \
$(plugin_in_files) \
- $(gsettings_in_file)
+ $(gsettings_in_file)
CLEANFILES = $(gsettings_SCHEMAS)
diff --git a/plugins/git/images/Makefile.am b/plugins/git/images/Makefile.am
index 3feb6b3..09747bf 100644
--- a/plugins/git/images/Makefile.am
+++ b/plugins/git/images/Makefile.am
@@ -1,6 +1,6 @@
# Plugin Icon file
git_pixmapsdir = $(anjuta_image_dir)
-git_pixmaps_DATA = \
+dist_git_pixmaps_DATA = \
anjuta-git-plugin-16.png \
anjuta-git-plugin-24.png \
anjuta-git-plugin-48.png \
@@ -9,8 +9,5 @@ git_pixmaps_DATA = \
anjuta-git-tasks-24.png \
anjuta-git-tasks-48.png \
anjuta-git-tasks.svg
-
-EXTRA_DIST = \
- $(git_pixmaps_DATA)
-include $(top_srcdir)/git.mk
diff --git a/plugins/indentation-c-style/Makefile.am b/plugins/indentation-c-style/Makefile.am
index 951f5df..5ae8e96 100644
--- a/plugins/indentation-c-style/Makefile.am
+++ b/plugins/indentation-c-style/Makefile.am
@@ -1,14 +1,14 @@
# Plugin glade file
indent_c_gladedir = $(anjuta_glade_dir)
-indent_c_glade_DATA = anjuta-indentation-c-style.ui
+dist_indent_c_glade_DATA = anjuta-indentation-c-style.ui
# Plugin UI file
indent_c_uidir = $(anjuta_ui_dir)
-indent_c_ui_DATA = anjuta-indentation-c-style.xml
+dist_indent_c_ui_DATA = anjuta-indentation-c-style.xml
# Plugin Icon file
indent_c_pixmapsdir = $(anjuta_image_dir)
-indent_c_pixmaps_DATA = \
+dist_indent_c_pixmaps_DATA = \
anjuta-indentation-c-style-plugin.png \
anjuta-indentation-c-style-auto-16.png \
anjuta-indentation-c-style-auto-24.png
@@ -18,7 +18,7 @@ plugin_in_files = anjuta-indentation-c-style.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
indent_c_plugindir = $(anjuta_plugin_dir)
-indent_c_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+dist_indent_c_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
# NOTE :
# The naming convention is very intentional
@@ -59,10 +59,6 @@ gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
EXTRA_DIST = \
$(plugin_in_files) \
- $(indent_c_plugin_DATA) \
- $(indent_c_ui_DATA) \
- $(indent_c_pixmaps_DATA) \
- $(indent_c_glade_DATA) \
$(gsettings_in_file)
CLEANFILES = \
diff --git a/plugins/indentation-python-style/Makefile.am b/plugins/indentation-python-style/Makefile.am
index 7e8b10c..7bcad65 100644
--- a/plugins/indentation-python-style/Makefile.am
+++ b/plugins/indentation-python-style/Makefile.am
@@ -1,21 +1,21 @@
# Plugin UI files
indent_python_uidir = $(anjuta_ui_dir)
-indent_python_ui_DATA = anjuta-indentation-python-style.xml
+dist_indent_python_ui_DATA = anjuta-indentation-python-style.xml
# Plugin Glade file
indent_python_gladedir = $(anjuta_glade_dir)
-indent_python_glade_DATA = anjuta-indentation-python-style.ui
+dist_indent_python_glade_DATA = anjuta-indentation-python-style.ui
# Plugin Icon file
indent_python_pixmapsdir = $(anjuta_image_dir)
-indent_python_pixmaps_DATA = anjuta-indentation-python-style-plugin.png
+dist_indent_python_pixmaps_DATA = anjuta-indentation-python-style-plugin.png
# Plugin description file
plugin_in_files = anjuta-indentation-python-style.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
indent_python_plugindir = $(anjuta_plugin_dir)
-indent_python_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+dist_indent_python_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
AM_CPPFLAGS = \
$(XML_CFLAGS) \
@@ -47,10 +47,6 @@ gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
EXTRA_DIST = \
$(plugin_in_files) \
- $(indent_python_plugin_DATA) \
- $(indent_python_ui_DATA) \
- $(indent_python_glade_DATA) \
- $(indent_python_pixmaps_DATA) \
$(gsettings_in_file)
CLEANFILES = \
diff --git a/plugins/jhbuild/Makefile.am b/plugins/jhbuild/Makefile.am
index 5dcb864..62f4370 100644
--- a/plugins/jhbuild/Makefile.am
+++ b/plugins/jhbuild/Makefile.am
@@ -1,6 +1,6 @@
# Plugin Icon file
jhbuild_pixmapsdir = $(anjuta_image_dir)
-jhbuild_pixmaps_DATA = \
+dist_jhbuild_pixmaps_DATA = \
anjuta-jhbuild-plugin-48.png
# Plugin description file
@@ -8,7 +8,7 @@ plugin_in_files = anjuta-jhbuild.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
jhbuild_plugindir = $(anjuta_plugin_dir)
-jhbuild_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+dist_jhbuild_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
# NOTE :
# The naming convention is very intentional
@@ -41,8 +41,6 @@ libanjuta_jhbuild_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
EXTRA_DIST = \
- $(plugin_in_files) \
- $(jhbuild_plugin_DATA) \
- $(jhbuild_pixmaps_DATA)
+ $(plugin_in_files)
-include $(top_srcdir)/git.mk
diff --git a/plugins/js-debugger/Makefile.am b/plugins/js-debugger/Makefile.am
index d7cf1b3..169465a 100644
--- a/plugins/js-debugger/Makefile.am
+++ b/plugins/js-debugger/Makefile.am
@@ -1,13 +1,13 @@
# Plugin Icon file
js_debugger_pixmapsdir = $(anjuta_image_dir)
-js_debugger_pixmaps_DATA = js_debugger.png
+dist_js_debugger_pixmaps_DATA = js_debugger.png
# Plugin description file
plugin_in_files = js_debugger.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
js_debugger_plugindir = $(anjuta_plugin_dir)
-js_debugger_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+dist_js_debugger_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
# NOTE :
# The naming convention is very intentional
@@ -45,8 +45,6 @@ libjs_debugger_la_LIBADD = \
$(LIBANJUTA_LIBS)
EXTRA_DIST = \
- $(plugin_in_files) \
- $(js_debugger_plugin_DATA) \
- $(js_debugger_pixmaps_DATA)
+ $(plugin_in_files)
-include $(top_srcdir)/git.mk
diff --git a/plugins/language-manager/Makefile.am b/plugins/language-manager/Makefile.am
index 8256dfc..4717db9 100644
--- a/plugins/language-manager/Makefile.am
+++ b/plugins/language-manager/Makefile.am
@@ -1,18 +1,18 @@
# Plugin Icon file
language_manager_pixmapsdir = $(anjuta_image_dir)
-language_manager_pixmaps_DATA = \
+dist_language_manager_pixmaps_DATA = \
anjuta-language-manager-plugin.svg \
anjuta-language-manager-plugin-48.png
language_manager_xmldir = $(anjuta_data_dir)
-language_manager_xml_DATA = languages.xml
+dist_language_manager_xml_DATA = languages.xml
# Plugin description file
plugin_in_files = language-manager.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
language_manager_plugindir = $(anjuta_plugin_dir)
-language_manager_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+dist_language_manager_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
# NOTE :
# The naming convention is very intentional
@@ -45,9 +45,6 @@ liblanguage_manager_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
EXTRA_DIST = \
$(plugin_in_files) \
- $(language_manager_plugin_DATA) \
- $(langauge_manager_xml_DATA) \
- $(language_manager_pixmaps_DATA) \
languages.xml
diff --git a/plugins/language-support-cpp-java/Makefile.am b/plugins/language-support-cpp-java/Makefile.am
index 2b1777b..5977896 100644
--- a/plugins/language-support-cpp-java/Makefile.am
+++ b/plugins/language-support-cpp-java/Makefile.am
@@ -1,14 +1,14 @@
# Plugin glade file
cpp_java_gladedir = $(anjuta_glade_dir)
-cpp_java_glade_DATA = anjuta-language-cpp-java.ui
+dist_cpp_java_glade_DATA = anjuta-language-cpp-java.ui
# Plugin UI file
cpp_java_uidir = $(anjuta_ui_dir)
-cpp_java_ui_DATA = anjuta-language-support-cpp-java.xml
+dist_cpp_java_ui_DATA = anjuta-language-support-cpp-java.xml
# Plugin Icon file
cpp_java_pixmapsdir = $(anjuta_image_dir)
-cpp_java_pixmaps_DATA = \
+dist_cpp_java_pixmaps_DATA = \
anjuta-language-cpp-java-plugin.png \
anjuta-indent-auto-16.png \
anjuta-indent-auto-24.png
@@ -18,7 +18,7 @@ plugin_in_files = anjuta-language-cpp-java.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
cpp_java_plugindir = $(anjuta_plugin_dir)
-cpp_java_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+dist_cpp_java_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
# NOTE :
# The naming convention is very intentional
@@ -63,10 +63,6 @@ gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
EXTRA_DIST = \
$(plugin_in_files) \
- $(cpp_java_plugin_DATA) \
- $(cpp_java_ui_DATA) \
- $(cpp_java_pixmaps_DATA) \
- $(cpp_java_glade_DATA) \
$(gsettings_in_file)
CLEANFILES = \
diff --git a/plugins/language-support-js/Makefile.am b/plugins/language-support-js/Makefile.am
index 7ff09e7..99c8641 100644
--- a/plugins/language-support-js/Makefile.am
+++ b/plugins/language-support-js/Makefile.am
@@ -3,21 +3,21 @@
#SUBDIRS = unit_test
js_support_plugin_gladedir = $(anjuta_glade_dir)
-js_support_plugin_glade_DATA = anjuta-language-javascript.ui
+dist_js_support_plugin_glade_DATA = anjuta-language-javascript.ui
js_support_plugin_uidir = $(anjuta_ui_dir)
-js_support_plugin_ui_DATA = anjuta-language-javascript.xml
+dist_js_support_plugin_ui_DATA = anjuta-language-javascript.xml
# Plugin Icon file
js_support_plugin_pixmapsdir = $(anjuta_image_dir)
-js_support_plugin_pixmaps_DATA = js_support_plugin.png
+dist_js_support_plugin_pixmaps_DATA = js_support_plugin.png
# Plugin description file
plugin_in_files = js-support-plugin.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
js_support_plugin_plugindir = $(anjuta_plugin_dir)
-js_support_plugin_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+dist_js_support_plugin_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
# NOTE :
# The naming convention is very intentional
@@ -71,11 +71,7 @@ gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
@GSETTINGS_RULES@
EXTRA_DIST = \
- $(plugin_in_files)\
- $(js_support_plugin_plugin_DATA)\
- $(js_support_plugin_glade_DATA)\
- $(js_support_plugin_ui_DATA)\
- $(js_support_plugin_pixmaps_DATA) \
+ $(plugin_in_files) \
$(gsettings_in_file)
CLEANFILES = \
diff --git a/plugins/language-support-python/Makefile.am b/plugins/language-support-python/Makefile.am
index b38379b..4a048dc 100644
--- a/plugins/language-support-python/Makefile.am
+++ b/plugins/language-support-python/Makefile.am
@@ -1,25 +1,25 @@
# Plugin UI files
python_plugin_uidir = $(anjuta_ui_dir)
-python_plugin_ui_DATA = anjuta-language-support-python.xml
+dist_python_plugin_ui_DATA = anjuta-language-support-python.xml
# Plugin Glade file
python_plugin_gladedir = $(anjuta_glade_dir)
-python_plugin_glade_DATA = anjuta-language-support-python.ui
+dist_python_plugin_glade_DATA = anjuta-language-support-python.ui
# Plugin Icon file
python_plugin_pixmapsdir = $(anjuta_image_dir)
-python_plugin_pixmaps_DATA = anjuta-language-support-python-plugin.png
+dist_python_plugin_pixmaps_DATA = anjuta-language-support-python-plugin.png
# Plugin Python Scripts
scriptsdir = $(anjuta_plugin_dir)
-scripts_SCRIPTS = anjuta-python-autocomplete.py
+dist_scripts_SCRIPTS = anjuta-python-autocomplete.py
# Plugin description file
plugin_in_files = anjuta-language-support-python.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
python_plugin_plugindir = $(anjuta_plugin_dir)
-python_plugin_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+dist_python_plugin_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
AM_CPPFLAGS = \
$(XML_CFLAGS) \
@@ -49,11 +49,6 @@ gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
EXTRA_DIST = \
$(plugin_in_files) \
- $(python_plugin_plugin_DATA) \
- $(python_plugin_ui_DATA) \
- $(python_plugin_glade_DATA) \
- $(python_plugin_pixmaps_DATA) \
- $(scripts_SCRIPTS) \
$(gsettings_in_file)
CLEANFILES = \
diff --git a/plugins/message-view/Makefile.am b/plugins/message-view/Makefile.am
index 57d02f0..703554c 100644
--- a/plugins/message-view/Makefile.am
+++ b/plugins/message-view/Makefile.am
@@ -1,9 +1,9 @@
# Plugin glade file
message_view_gladedir = $(anjuta_glade_dir)
-message_view_glade_DATA = anjuta-message-manager-plugin.ui
+dist_message_view_glade_DATA = anjuta-message-manager-plugin.ui
message_view_pixmapsdir = $(anjuta_image_dir)
-message_view_pixmaps_DATA = \
+dist_message_view_pixmaps_DATA = \
anjuta-messages-plugin.svg \
anjuta-messages-plugin-48.png \
anjuta-go-message-prev-16.png \
@@ -12,13 +12,13 @@ message_view_pixmaps_DATA = \
anjuta-go-message-next-24.png
message_view_uidir = $(anjuta_ui_dir)
-message_view_ui_DATA = anjuta-message-manager.xml
+dist_message_view_ui_DATA = anjuta-message-manager.xml
plugin_in_files = anjuta-message-manager.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
message_view_plugindir = $(anjuta_plugin_dir)
-message_view_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+dist_message_view_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
AM_CPPFLAGS= \
$(WARN_CFLAGS) \
@@ -49,10 +49,6 @@ gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
EXTRA_DIST = \
$(plugin_in_files) \
- $(message_view_pixmaps_DATA) \
- $(message_view_plugin_DATA) \
- $(message_view_ui_DATA) \
- $(message_view_glade_DATA) \
$(gsettings_in_file)
CLEANFILES = \
diff --git a/plugins/mk-project/Makefile.am b/plugins/mk-project/Makefile.am
index 52ddc0b..4741ae6 100644
--- a/plugins/mk-project/Makefile.am
+++ b/plugins/mk-project/Makefile.am
@@ -1,21 +1,21 @@
# Plugin UI file
plugin_uidir = $(anjuta_ui_dir)
-plugin_ui_DATA =
+dist_plugin_ui_DATA =
# Plugin glade file
plugin_gladedir = $(anjuta_glade_dir)
-plugin_glade_DATA = mk-project.ui
+dist_plugin_glade_DATA = mk-project.ui
# Plugin icon file
plugin_pixmapsdir = $(anjuta_image_dir)
-plugin_pixmaps_DATA = mk-project-plugin-48.png
+dist_plugin_pixmaps_DATA = mk-project-plugin-48.png
# Plugin description file
plugin_in_files = mk-project.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
plugindir = $(anjuta_plugin_dir)
-plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+dist_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
AM_CPPFLAGS = \
$(WARN_CFLAGS) \
@@ -63,10 +63,6 @@ mk-scanner.h: mk-parser.c
EXTRA_DIST = \
$(plugin_in_files) \
- $(plugin_DATA) \
- $(plugin_ui_DATA) \
- $(plugin_pixmaps_DATA) \
- $(plugin_glade_DATA) \
mk-parser.h
DISTCLEANFILES = \
diff --git a/plugins/parser-cxx/Makefile.am b/plugins/parser-cxx/Makefile.am
index 43b40e1..73ca6b7 100644
--- a/plugins/parser-cxx/Makefile.am
+++ b/plugins/parser-cxx/Makefile.am
@@ -2,11 +2,11 @@ SUBDIRS = cxxparser
# Plugin glade file
parser_cxx_gladedir = $(anjuta_glade_dir)
-parser_cxx_glade_DATA = anjuta-parser-cxx.ui
+dist_parser_cxx_glade_DATA = anjuta-parser-cxx.ui
# Plugin Icon file
parser_cxx_pixmapsdir = $(anjuta_image_dir)
-parser_cxx_pixmaps_DATA = \
+dist_parser_cxx_pixmaps_DATA = \
anjuta-parser-cxx-plugin.png
# Plugin description file
@@ -14,7 +14,7 @@ plugin_in_files = anjuta-parser-cxx.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
parser_cxx_plugindir = $(anjuta_plugin_dir)
-parser_cxx_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+dist_parser_cxx_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
# NOTE :
# The naming convention is very intentional
@@ -62,9 +62,6 @@ gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
EXTRA_DIST = \
$(plugin_in_files) \
- $(parser_cxx_plugin_DATA) \
- $(parser_cxx_pixmaps_DATA) \
- $(parser_cxx_glade_DATA) \
$(gsettings_in_file)
CLEANFILES = \
diff --git a/plugins/patch/Makefile.am b/plugins/patch/Makefile.am
index 7745dd4..fce23c2 100644
--- a/plugins/patch/Makefile.am
+++ b/plugins/patch/Makefile.am
@@ -1,14 +1,14 @@
# Plugin UI file
patch_uidir = $(anjuta_ui_dir)
-patch_ui_DATA = anjuta-patch.xml
+dist_patch_ui_DATA = anjuta-patch.xml
# Plugin glade file
patch_gladedir = $(anjuta_glade_dir)
-patch_glade_DATA = patch-plugin.ui
+dist_patch_glade_DATA = patch-plugin.ui
# Plugin Icon file
patch_pixmapsdir = $(anjuta_image_dir)
-patch_pixmaps_DATA = \
+dist_patch_pixmaps_DATA = \
anjuta-patch-plugin.svg \
anjuta-patch-plugin-48.png
@@ -18,7 +18,7 @@ plugin_in_files = anjuta-patch.plugin.in
patch_plugindir = $(anjuta_plugin_dir)
-patch_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+dist_patch_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
# Include paths
AM_CPPFLAGS= \
@@ -46,10 +46,6 @@ libanjuta_patch_la_LIBADD = \
$(LIBANJUTA_LIBS)
EXTRA_DIST = \
- $(plugin_in_files) \
- $(patch_plugin_DATA) \
- $(patch_ui_DATA) \
- $(patch_pixmaps_DATA) \
- $(patch_glade_DATA)
+ $(plugin_in_files)
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-import/Makefile.am b/plugins/project-import/Makefile.am
index 2afcae5..7b46d55 100644
--- a/plugins/project-import/Makefile.am
+++ b/plugins/project-import/Makefile.am
@@ -1,10 +1,10 @@
# Plugin glade file
wizard_gladedir = $(anjuta_glade_dir)
-wizard_glade_DATA = project-import.ui
+dist_wizard_glade_DATA = project-import.ui
# Plugin pixmaps
wizard_pixmapsdir = $(anjuta_image_dir)
-wizard_pixmaps_DATA = \
+dist_wizard_pixmaps_DATA = \
anjuta-project-import-plugin.svg \
anjuta-project-import-plugin-48.png
@@ -13,7 +13,7 @@ plugin_in_files = anjuta-project-import.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
wizard_plugindir = $(anjuta_plugin_dir)
-wizard_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+dist_wizard_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
plugindir = $(anjuta_plugin_dir)
plugin_LTLIBRARIES = libanjuta-project-import.la
@@ -38,10 +38,6 @@ libanjuta_project_import_la_SOURCES= \
project-import-dialog.c
EXTRA_DIST = \
- $(plugin_in_files) \
- $(wizard_pixmaps_DATA) \
- $(project_import_DATA) \
- $(wizard_plugin_DATA) \
- $(wizard_glade_DATA)
+ $(plugin_in_files)
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-manager/Makefile.am b/plugins/project-manager/Makefile.am
index 3adb855..841abe5 100644
--- a/plugins/project-manager/Makefile.am
+++ b/plugins/project-manager/Makefile.am
@@ -1,14 +1,14 @@
# Plugin UI file
project_uidir = $(anjuta_ui_dir)
-project_ui_DATA = anjuta-project-manager.xml
+dist_project_ui_DATA = anjuta-project-manager.xml
# Plugin glade file
project_gladedir = $(anjuta_glade_dir)
-project_glade_DATA = pm_dialogs.ui
+dist_project_glade_DATA = pm_dialogs.ui
# Plugin Icon file
project_pixmapsdir = $(anjuta_image_dir)
-project_pixmaps_DATA = \
+dist_project_pixmaps_DATA = \
anjuta-project-manager-plugin.svg \
anjuta-project-manager-plugin-48.png \
anjuta-project-manager-plugin-16.png \
@@ -20,7 +20,7 @@ plugin_in_files = anjuta-project-manager.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
project_plugindir = $(anjuta_plugin_dir)
-project_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+dist_project_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
# Additional marshaller
project-marshal.h: project-marshal.list
@@ -79,10 +79,6 @@ libanjuta_project_manager_la_LIBADD = \
EXTRA_DIST = \
$(plugin_in_files) \
- $(project_plugin_DATA) \
- $(project_ui_DATA) \
- $(project_pixmaps_DATA) \
- $(project_glade_DATA) \
project-marshal.list
DISTCLEANFILES = \
diff --git a/plugins/project-wizard/Makefile.am b/plugins/project-wizard/Makefile.am
index 7e45cf6..c91356e 100644
--- a/plugins/project-wizard/Makefile.am
+++ b/plugins/project-wizard/Makefile.am
@@ -3,17 +3,17 @@ SUBDIRS = templates
# Plugin glade file
wizard_gladedir = $(anjuta_glade_dir)
-wizard_glade_DATA = anjuta-project-wizard.ui \
+dist_wizard_glade_DATA = anjuta-project-wizard.ui \
applogo.png \
appwizard.png
# Plugin UI file
wizard_uidir = $(anjuta_ui_dir)
-wizard_ui_DATA =
+dist_wizard_ui_DATA =
# Plugin pixmaps
wizard_pixmapsdir = $(anjuta_image_dir)
-wizard_pixmaps_DATA = \
+dist_wizard_pixmaps_DATA = \
anjuta-project-wizard-plugin.svg \
anjuta-project-wizard-plugin-48.png
@@ -22,7 +22,7 @@ plugin_in_files = anjuta-project-wizard.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
wizard_plugindir = $(anjuta_plugin_dir)
-wizard_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+dist_wizard_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
plugindir = $(anjuta_plugin_dir)
plugin_LTLIBRARIES = libanjuta-project-wizard.la
@@ -61,11 +61,7 @@ libanjuta_project_wizard_la_SOURCES= \
tar.h
EXTRA_DIST = \
- $(plugin_in_files) \
- $(wizard_pixmaps_DATA) \
- $(wizard_plugin_DATA) \
- $(wizard_glade_DATA) \
- $(wizard_ui_DATA)
+ $(plugin_in_files)
## templates_dir = $(datadir)/anjuta/projects
##
diff --git a/plugins/project-wizard/templates/Makefile.am b/plugins/project-wizard/templates/Makefile.am
index 0662ccf..5e776c7 100644
--- a/plugins/project-wizard/templates/Makefile.am
+++ b/plugins/project-wizard/templates/Makefile.am
@@ -29,7 +29,7 @@ template_in_files = \
licenses.tpl.in
wizard_filesdir = $(anjuta_data_dir)/templates
-wizard_files_DATA = \
+dist_wizard_files_DATA = \
terminal-logo.png \
cpp-logo.png \
django-logo.png \
@@ -57,6 +57,6 @@ wizard_files_DATA = \
rm $ _
-EXTRA_DIST = $(wizard_files_DATA) $(template_in_files)
+EXTRA_DIST = $(template_in_files)
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/anjuta-plugin/Makefile.am
b/plugins/project-wizard/templates/anjuta-plugin/Makefile.am
index 7e027ef..18a896e 100644
--- a/plugins/project-wizard/templates/anjuta-plugin/Makefile.am
+++ b/plugins/project-wizard/templates/anjuta-plugin/Makefile.am
@@ -2,10 +2,8 @@
SUBDIRS = src po
wizard_filesdir = $(anjuta_data_dir)/templates/anjuta-plugin
-wizard_files_DATA = \
+dist_wizard_files_DATA = \
configure.ac.tpl
-EXTRA_DIST = $(wizard_files_DATA)
-
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/anjuta-plugin/po/Makefile.am
b/plugins/project-wizard/templates/anjuta-plugin/po/Makefile.am
index 1e25f2e..69258ce 100644
--- a/plugins/project-wizard/templates/anjuta-plugin/po/Makefile.am
+++ b/plugins/project-wizard/templates/anjuta-plugin/po/Makefile.am
@@ -1,5 +1,4 @@
wizard_filesdir = $(anjuta_data_dir)/templates/anjuta-plugin/po
-wizard_files_DATA = POTFILES.in
-EXTRA_DIST = $(wizard_files_DATA)
+dist_wizard_files_DATA = POTFILES.in
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/anjuta-plugin/src/Makefile.am
b/plugins/project-wizard/templates/anjuta-plugin/src/Makefile.am
index b53d93d..c76f749 100644
--- a/plugins/project-wizard/templates/anjuta-plugin/src/Makefile.am
+++ b/plugins/project-wizard/templates/anjuta-plugin/src/Makefile.am
@@ -1,5 +1,5 @@
wizard_filesdir = $(anjuta_data_dir)/templates/anjuta-plugin/src
-wizard_files_DATA = \
+dist_wizard_files_DATA = \
Makefile.am.tpl \
plugin.c \
plugin.ui \
@@ -7,6 +7,4 @@ wizard_files_DATA = \
plugin.plugin.in \
plugin.xml
-EXTRA_DIST = $(wizard_files_DATA)
-
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/cpp/Makefile.am
b/plugins/project-wizard/templates/cpp/Makefile.am
index 0e26186..8e2e76c 100644
--- a/plugins/project-wizard/templates/cpp/Makefile.am
+++ b/plugins/project-wizard/templates/cpp/Makefile.am
@@ -2,9 +2,7 @@
SUBDIRS = src po
wizard_filesdir = $(anjuta_data_dir)/templates/cpp
-wizard_files_DATA = \
+dist_wizard_files_DATA = \
configure.ac.tpl
-EXTRA_DIST = $(wizard_files_DATA)
-
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/cpp/po/Makefile.am
b/plugins/project-wizard/templates/cpp/po/Makefile.am
index 5a4a035..cc47855 100644
--- a/plugins/project-wizard/templates/cpp/po/Makefile.am
+++ b/plugins/project-wizard/templates/cpp/po/Makefile.am
@@ -1,5 +1,4 @@
wizard_filesdir = $(anjuta_data_dir)/templates/cpp/po
-wizard_files_DATA = POTFILES.in
-EXTRA_DIST = $(wizard_files_DATA)
+dist_wizard_files_DATA = POTFILES.in
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/cpp/src/Makefile.am
b/plugins/project-wizard/templates/cpp/src/Makefile.am
index 214ef7f..66dfa4a 100644
--- a/plugins/project-wizard/templates/cpp/src/Makefile.am
+++ b/plugins/project-wizard/templates/cpp/src/Makefile.am
@@ -1,6 +1,4 @@
wizard_filesdir = $(anjuta_data_dir)/templates/cpp/src
-wizard_files_DATA = main.cc Makefile.am.tpl
-
-EXTRA_DIST = $(wizard_files_DATA)
+dist_wizard_files_DATA = main.cc Makefile.am.tpl
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/directory/Makefile.am
b/plugins/project-wizard/templates/directory/Makefile.am
index c54ab64..6ac8473 100644
--- a/plugins/project-wizard/templates/directory/Makefile.am
+++ b/plugins/project-wizard/templates/directory/Makefile.am
@@ -1,8 +1,6 @@
wizard_filesdir = $(anjuta_data_dir)/templates/directory
-wizard_files_DATA = \
+dist_wizard_files_DATA = \
project.anjuta
-EXTRA_DIST = $(wizard_files_DATA)
-
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/gcj/Makefile.am
b/plugins/project-wizard/templates/gcj/Makefile.am
index a0e6cac..ebab520 100644
--- a/plugins/project-wizard/templates/gcj/Makefile.am
+++ b/plugins/project-wizard/templates/gcj/Makefile.am
@@ -2,9 +2,7 @@
SUBDIRS = src
wizard_filesdir = $(anjuta_data_dir)/templates/gcj
-wizard_files_DATA = \
+dist_wizard_files_DATA = \
configure.ac.tpl
-EXTRA_DIST = $(wizard_files_DATA)
-
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/gcj/src/Makefile.am
b/plugins/project-wizard/templates/gcj/src/Makefile.am
index 0ef06c3..e4e47a8 100644
--- a/plugins/project-wizard/templates/gcj/src/Makefile.am
+++ b/plugins/project-wizard/templates/gcj/src/Makefile.am
@@ -1,6 +1,5 @@
wizard_filesdir = $(anjuta_data_dir)/templates/gcj/src
-wizard_files_DATA = Makefile.am.tpl
-EXTRA_DIST = $(wizard_files_DATA)
+dist_wizard_files_DATA = Makefile.am.tpl
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/gnome-shell-extension/Makefile.am
b/plugins/project-wizard/templates/gnome-shell-extension/Makefile.am
index 3261b6b..bb34649 100644
--- a/plugins/project-wizard/templates/gnome-shell-extension/Makefile.am
+++ b/plugins/project-wizard/templates/gnome-shell-extension/Makefile.am
@@ -2,7 +2,6 @@
SUBDIRS = src
wizard_filesdir = $(anjuta_data_dir)/templates/gnome-shell-extension
-wizard_files_DATA = autogen.sh configure.ac.tpl Makefile.am.tpl project.anjuta
-EXTRA_DIST = $(wizard_files_DATA)
+dist_wizard_files_DATA = autogen.sh configure.ac.tpl Makefile.am.tpl project.anjuta
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/gnome-shell-extension/src/Makefile.am
b/plugins/project-wizard/templates/gnome-shell-extension/src/Makefile.am
index ed01544..fc01ab5 100644
--- a/plugins/project-wizard/templates/gnome-shell-extension/src/Makefile.am
+++ b/plugins/project-wizard/templates/gnome-shell-extension/src/Makefile.am
@@ -1,5 +1,4 @@
wizard_filesdir = $(anjuta_data_dir)/templates/gnome-shell-extension/src
-wizard_files_DATA = extension.js Makefile.am.tpl metadata.json stylesheet.css
-EXTRA_DIST = $(wizard_files_DATA)
+dist_wizard_files_DATA = extension.js Makefile.am.tpl metadata.json stylesheet.css
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/gtk/po/Makefile.am
b/plugins/project-wizard/templates/gtk/po/Makefile.am
index 83708ee..e073d5f 100644
--- a/plugins/project-wizard/templates/gtk/po/Makefile.am
+++ b/plugins/project-wizard/templates/gtk/po/Makefile.am
@@ -1,5 +1,4 @@
wizard_filesdir = $(anjuta_data_dir)/templates/gtk/po
-wizard_files_DATA = POTFILES.in
-EXTRA_DIST = $(wizard_files_DATA)
+dist_wizard_files_DATA = POTFILES.in
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/gtk/src/Makefile.am
b/plugins/project-wizard/templates/gtk/src/Makefile.am
index 135f5e6..2136879 100644
--- a/plugins/project-wizard/templates/gtk/src/Makefile.am
+++ b/plugins/project-wizard/templates/gtk/src/Makefile.am
@@ -1,5 +1,4 @@
wizard_filesdir = $(anjuta_data_dir)/templates/gtk/src
-wizard_files_DATA = main.c Makefile.am.tpl project.ui
-EXTRA_DIST = $(wizard_files_DATA)
+dist_wizard_files_DATA = main.c Makefile.am.tpl project.ui
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/gtkapplication/po/Makefile.am
b/plugins/project-wizard/templates/gtkapplication/po/Makefile.am
index d517633..75cc660 100644
--- a/plugins/project-wizard/templates/gtkapplication/po/Makefile.am
+++ b/plugins/project-wizard/templates/gtkapplication/po/Makefile.am
@@ -1,5 +1,4 @@
wizard_filesdir = $(anjuta_data_dir)/templates/gtkapplication/po
-wizard_files_DATA = POTFILES.in
-EXTRA_DIST = $(wizard_files_DATA)
+dist_wizard_files_DATA = POTFILES.in
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/gtkapplication/src/Makefile.am
b/plugins/project-wizard/templates/gtkapplication/src/Makefile.am
index 6103252..4bb93b8 100644
--- a/plugins/project-wizard/templates/gtkapplication/src/Makefile.am
+++ b/plugins/project-wizard/templates/gtkapplication/src/Makefile.am
@@ -1,5 +1,4 @@
wizard_filesdir = $(anjuta_data_dir)/templates/gtkapplication/src
-wizard_files_DATA = main.c application.c application.h Makefile.am.tpl project.ui
-EXTRA_DIST = $(wizard_files_DATA)
+dist_wizard_files_DATA = main.c application.c application.h Makefile.am.tpl project.ui
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/gtkmm/Makefile.am
b/plugins/project-wizard/templates/gtkmm/Makefile.am
index f63ecd8..9fb8eb1 100644
--- a/plugins/project-wizard/templates/gtkmm/Makefile.am
+++ b/plugins/project-wizard/templates/gtkmm/Makefile.am
@@ -2,9 +2,7 @@
SUBDIRS = src po
wizard_filesdir = $(anjuta_data_dir)/templates/gtkmm
-wizard_files_DATA =
-
-EXTRA_DIST = $(wizard_files_DATA)
+dist_wizard_files_DATA =
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/gtkmm/po/Makefile.am
b/plugins/project-wizard/templates/gtkmm/po/Makefile.am
index ed1fc97..7aab018 100644
--- a/plugins/project-wizard/templates/gtkmm/po/Makefile.am
+++ b/plugins/project-wizard/templates/gtkmm/po/Makefile.am
@@ -1,5 +1,4 @@
wizard_filesdir = $(anjuta_data_dir)/templates/gtkmm/po
-wizard_files_DATA = POTFILES.in
-EXTRA_DIST = $(wizard_files_DATA)
+dist_wizard_files_DATA = POTFILES.in
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/gtkmm/src/Makefile.am
b/plugins/project-wizard/templates/gtkmm/src/Makefile.am
index 5ee4ff3..8624141 100644
--- a/plugins/project-wizard/templates/gtkmm/src/Makefile.am
+++ b/plugins/project-wizard/templates/gtkmm/src/Makefile.am
@@ -1,5 +1,4 @@
wizard_filesdir = $(anjuta_data_dir)/templates/gtkmm/src
-wizard_files_DATA = main.cc Makefile.am.tpl project.ui
-EXTRA_DIST = $(wizard_files_DATA)
+dist_wizard_files_DATA = main.cc Makefile.am.tpl project.ui
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/java/Makefile.am
b/plugins/project-wizard/templates/java/Makefile.am
index 121eee3..3cccaa1 100644
--- a/plugins/project-wizard/templates/java/Makefile.am
+++ b/plugins/project-wizard/templates/java/Makefile.am
@@ -2,11 +2,8 @@
SUBDIRS = src po
wizard_filesdir = $(anjuta_data_dir)/templates/java
-wizard_files_DATA = \
+dist_wizard_files_DATA = \
configure.ac.tpl \
project.anjuta
-EXTRA_DIST = $(wizard_files_DATA)
-
-
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/java/po/Makefile.am
b/plugins/project-wizard/templates/java/po/Makefile.am
index 2ae3cb5..0079d25 100644
--- a/plugins/project-wizard/templates/java/po/Makefile.am
+++ b/plugins/project-wizard/templates/java/po/Makefile.am
@@ -1,5 +1,4 @@
wizard_filesdir = $(anjuta_data_dir)/templates/java/po
-wizard_files_DATA = POTFILES.in
-EXTRA_DIST = $(wizard_files_DATA)
+dist_wizard_files_DATA = POTFILES.in
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/java/src/Makefile.am
b/plugins/project-wizard/templates/java/src/Makefile.am
index 009d11f..6fb0061 100644
--- a/plugins/project-wizard/templates/java/src/Makefile.am
+++ b/plugins/project-wizard/templates/java/src/Makefile.am
@@ -1,5 +1,4 @@
wizard_filesdir = $(anjuta_data_dir)/templates/java/src
-wizard_files_DATA = main.java Makefile.am.tpl
-EXTRA_DIST = $(wizard_files_DATA)
+dist_wizard_files_DATA = main.java Makefile.am.tpl
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/js_minimal/Makefile.am
b/plugins/project-wizard/templates/js_minimal/Makefile.am
index cd21cf1..48ebf3b 100644
--- a/plugins/project-wizard/templates/js_minimal/Makefile.am
+++ b/plugins/project-wizard/templates/js_minimal/Makefile.am
@@ -1,12 +1,10 @@
SUBDIRS = src
wizard_filesdir = $(anjuta_data_dir)/templates/js_minimal
-wizard_files_DATA = \
+dist_wizard_files_DATA = \
autogen.sh \
configure.ac.tpl \
Makefile.am.tpl \
project.anjuta
-EXTRA_DIST = $(wizard_files_DATA)
-
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/js_minimal/src/Makefile.am
b/plugins/project-wizard/templates/js_minimal/src/Makefile.am
index 14071e8..612a576 100644
--- a/plugins/project-wizard/templates/js_minimal/src/Makefile.am
+++ b/plugins/project-wizard/templates/js_minimal/src/Makefile.am
@@ -1,5 +1,4 @@
wizard_filesdir = $(anjuta_data_dir)/templates/js_minimal/src
-wizard_files_DATA = main.js Makefile.am.tpl
-EXTRA_DIST = $(wizard_files_DATA)
+dist_wizard_files_DATA = main.js Makefile.am.tpl
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/library/Makefile.am
b/plugins/project-wizard/templates/library/Makefile.am
index f62ca6a..905a85a 100644
--- a/plugins/project-wizard/templates/library/Makefile.am
+++ b/plugins/project-wizard/templates/library/Makefile.am
@@ -2,9 +2,7 @@
SUBDIRS = src po
wizard_filesdir = $(anjuta_data_dir)/templates/library
-wizard_files_DATA = \
+dist_wizard_files_DATA = \
configure.ac.tpl
-EXTRA_DIST = $(wizard_files_DATA)
-
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/library/po/Makefile.am
b/plugins/project-wizard/templates/library/po/Makefile.am
index 1751b61..96b5cbe 100644
--- a/plugins/project-wizard/templates/library/po/Makefile.am
+++ b/plugins/project-wizard/templates/library/po/Makefile.am
@@ -1,5 +1,4 @@
wizard_filesdir = $(anjuta_data_dir)/templates/library/po
-wizard_files_DATA = POTFILES.in
-EXTRA_DIST = $(wizard_files_DATA)
+dist_wizard_files_DATA = POTFILES.in
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/library/src/Makefile.am
b/plugins/project-wizard/templates/library/src/Makefile.am
index c853ab6..087b29b 100644
--- a/plugins/project-wizard/templates/library/src/Makefile.am
+++ b/plugins/project-wizard/templates/library/src/Makefile.am
@@ -1,5 +1,4 @@
wizard_filesdir = $(anjuta_data_dir)/templates/library/src
-wizard_files_DATA = lib.c lib.h Makefile.am.tpl library.pc.in
-EXTRA_DIST = $(wizard_files_DATA)
+dist_wizard_files_DATA = lib.c lib.h Makefile.am.tpl library.pc.in
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/m4/Makefile.am b/plugins/project-wizard/templates/m4/Makefile.am
index ccc8525..ac2da08 100644
--- a/plugins/project-wizard/templates/m4/Makefile.am
+++ b/plugins/project-wizard/templates/m4/Makefile.am
@@ -1,9 +1,7 @@
wizard_filesdir = $(anjuta_data_dir)/templates/m4
-wizard_files_DATA = \
+dist_wizard_files_DATA = \
as-ac-expand.m4 \
ac-define-dir.m4
-EXTRA_DIST = $(wizard_files_DATA)
-
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/minimal/Makefile.am
b/plugins/project-wizard/templates/minimal/Makefile.am
index 0fcdcf6..c00f06a 100644
--- a/plugins/project-wizard/templates/minimal/Makefile.am
+++ b/plugins/project-wizard/templates/minimal/Makefile.am
@@ -1,12 +1,10 @@
wizard_filesdir = $(anjuta_data_dir)/templates/minimal
-wizard_files_DATA = \
+dist_wizard_files_DATA = \
autogen.sh \
configure.ac.tpl \
Makefile.am.tpl \
project.anjuta \
anjuta.session
-EXTRA_DIST = $(wizard_files_DATA)
-
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/mkfile/Makefile.am
b/plugins/project-wizard/templates/mkfile/Makefile.am
index e4cad39..0fc792f 100644
--- a/plugins/project-wizard/templates/mkfile/Makefile.am
+++ b/plugins/project-wizard/templates/mkfile/Makefile.am
@@ -2,9 +2,7 @@
SUBDIRS = src po
wizard_filesdir = $(anjuta_data_dir)/templates/mkfile
-wizard_files_DATA = \
+dist_wizard_files_DATA = \
project.anjuta
-EXTRA_DIST = $(wizard_files_DATA)
-
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/mkfile/po/Makefile.am
b/plugins/project-wizard/templates/mkfile/po/Makefile.am
index df66793..0a615fb 100644
--- a/plugins/project-wizard/templates/mkfile/po/Makefile.am
+++ b/plugins/project-wizard/templates/mkfile/po/Makefile.am
@@ -1,5 +1,4 @@
wizard_filesdir = $(anjuta_data_dir)/templates/mkfile/po
-wizard_files_DATA = ChangeLog POTFILES.in
-EXTRA_DIST = $(wizard_files_DATA)
+dist_wizard_files_DATA = ChangeLog POTFILES.in
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/mkfile/src/Makefile.am
b/plugins/project-wizard/templates/mkfile/src/Makefile.am
index 4fc46ed..363938a 100644
--- a/plugins/project-wizard/templates/mkfile/src/Makefile.am
+++ b/plugins/project-wizard/templates/mkfile/src/Makefile.am
@@ -1,5 +1,4 @@
wizard_filesdir = $(anjuta_data_dir)/templates/mkfile/src
-wizard_files_DATA = Makefile.tpl main.c
-EXTRA_DIST = $(wizard_files_DATA)
+dist_wizard_files_DATA = Makefile.tpl main.c
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/pygtk/Makefile.am
b/plugins/project-wizard/templates/pygtk/Makefile.am
index daa2cbe..1c3ae57 100644
--- a/plugins/project-wizard/templates/pygtk/Makefile.am
+++ b/plugins/project-wizard/templates/pygtk/Makefile.am
@@ -2,11 +2,8 @@
SUBDIRS = src po
wizard_filesdir = $(anjuta_data_dir)/templates/pygtk
-wizard_files_DATA = \
+dist_wizard_files_DATA = \
configure.ac.tpl \
project.anjuta
-EXTRA_DIST = $(wizard_files_DATA)
-
-
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/pygtk/po/Makefile.am
b/plugins/project-wizard/templates/pygtk/po/Makefile.am
index 0bfc279..1a5fb19 100644
--- a/plugins/project-wizard/templates/pygtk/po/Makefile.am
+++ b/plugins/project-wizard/templates/pygtk/po/Makefile.am
@@ -1,5 +1,4 @@
wizard_filesdir = $(anjuta_data_dir)/templates/pygtk/po
-wizard_files_DATA = POTFILES.in
-EXTRA_DIST = $(wizard_files_DATA)
+dist_wizard_files_DATA = POTFILES.in
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/pygtk/src/Makefile.am
b/plugins/project-wizard/templates/pygtk/src/Makefile.am
index 7bbde11..afb4eb3 100644
--- a/plugins/project-wizard/templates/pygtk/src/Makefile.am
+++ b/plugins/project-wizard/templates/pygtk/src/Makefile.am
@@ -1,5 +1,4 @@
wizard_filesdir = $(anjuta_data_dir)/templates/pygtk/src
-wizard_files_DATA = main.py Makefile.am.tpl
-EXTRA_DIST = $(wizard_files_DATA)
+dist_wizard_files_DATA = main.py Makefile.am.tpl
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/python/Makefile.am
b/plugins/project-wizard/templates/python/Makefile.am
index ff633c3..9e48aac 100644
--- a/plugins/project-wizard/templates/python/Makefile.am
+++ b/plugins/project-wizard/templates/python/Makefile.am
@@ -2,11 +2,9 @@
SUBDIRS = src po
wizard_filesdir = $(anjuta_data_dir)/templates/python
-wizard_files_DATA = \
+dist_wizard_files_DATA = \
configure.ac.tpl \
project.anjuta
-EXTRA_DIST = $(wizard_files_DATA)
-
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/python/po/Makefile.am
b/plugins/project-wizard/templates/python/po/Makefile.am
index 4c1d14c..7145869 100644
--- a/plugins/project-wizard/templates/python/po/Makefile.am
+++ b/plugins/project-wizard/templates/python/po/Makefile.am
@@ -1,5 +1,4 @@
wizard_filesdir = $(anjuta_data_dir)/templates/python/po
-wizard_files_DATA = POTFILES.in
-EXTRA_DIST = $(wizard_files_DATA)
+dist_wizard_files_DATA = POTFILES.in
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/python/src/Makefile.am
b/plugins/project-wizard/templates/python/src/Makefile.am
index de68d87..7983a38 100644
--- a/plugins/project-wizard/templates/python/src/Makefile.am
+++ b/plugins/project-wizard/templates/python/src/Makefile.am
@@ -1,5 +1,4 @@
wizard_filesdir = $(anjuta_data_dir)/templates/python/src
-wizard_files_DATA = main.py Makefile.am.tpl
-EXTRA_DIST = $(wizard_files_DATA)
+dist_wizard_files_DATA = main.py Makefile.am.tpl
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/sdl/Makefile.am
b/plugins/project-wizard/templates/sdl/Makefile.am
index 3dd5cec..41a605d 100644
--- a/plugins/project-wizard/templates/sdl/Makefile.am
+++ b/plugins/project-wizard/templates/sdl/Makefile.am
@@ -2,10 +2,8 @@
SUBDIRS = src po
wizard_filesdir = $(anjuta_data_dir)/templates/sdl
-wizard_files_DATA = \
+dist_wizard_files_DATA = \
configure.ac.tpl \
acinclude.m4.tpl
-EXTRA_DIST = $(wizard_files_DATA)
-
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/sdl/po/Makefile.am
b/plugins/project-wizard/templates/sdl/po/Makefile.am
index 1a72d3d..54724a2 100644
--- a/plugins/project-wizard/templates/sdl/po/Makefile.am
+++ b/plugins/project-wizard/templates/sdl/po/Makefile.am
@@ -1,5 +1,4 @@
wizard_filesdir = $(anjuta_data_dir)/templates/sdl/po
-wizard_files_DATA = POTFILES.in
-EXTRA_DIST = $(wizard_files_DATA)
+dist_wizard_files_DATA = POTFILES.in
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/sdl/src/Makefile.am
b/plugins/project-wizard/templates/sdl/src/Makefile.am
index d2e3aa3..4315390 100644
--- a/plugins/project-wizard/templates/sdl/src/Makefile.am
+++ b/plugins/project-wizard/templates/sdl/src/Makefile.am
@@ -1,5 +1,4 @@
wizard_filesdir = $(anjuta_data_dir)/templates/sdl/src
-wizard_files_DATA = main.c Makefile.am.tpl
-EXTRA_DIST = $(wizard_files_DATA)
+dist_wizard_files_DATA = main.c Makefile.am.tpl
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/terminal/Makefile.am
b/plugins/project-wizard/templates/terminal/Makefile.am
index 0cb7685..2beb4b0 100644
--- a/plugins/project-wizard/templates/terminal/Makefile.am
+++ b/plugins/project-wizard/templates/terminal/Makefile.am
@@ -2,7 +2,7 @@
SUBDIRS = src po
wizard_filesdir = $(anjuta_data_dir)/templates/terminal
-wizard_files_DATA = \
+dist_wizard_files_DATA = \
AUTHORS \
ChangeLog \
autogen.sh \
@@ -12,6 +12,4 @@ wizard_files_DATA = \
project.anjuta \
README
-EXTRA_DIST = $(wizard_files_DATA)
-
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/terminal/po/Makefile.am
b/plugins/project-wizard/templates/terminal/po/Makefile.am
index 583e1d1..50e485e 100644
--- a/plugins/project-wizard/templates/terminal/po/Makefile.am
+++ b/plugins/project-wizard/templates/terminal/po/Makefile.am
@@ -1,6 +1,4 @@
wizard_filesdir = $(anjuta_data_dir)/templates/terminal/po
-wizard_files_DATA = ChangeLog POTFILES.in LINGUAS
-
-EXTRA_DIST = $(wizard_files_DATA)
+dist_wizard_files_DATA = ChangeLog POTFILES.in LINGUAS
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/terminal/src/Makefile.am
b/plugins/project-wizard/templates/terminal/src/Makefile.am
index 982dffc..62d3b05 100644
--- a/plugins/project-wizard/templates/terminal/src/Makefile.am
+++ b/plugins/project-wizard/templates/terminal/src/Makefile.am
@@ -1,6 +1,4 @@
wizard_filesdir = $(anjuta_data_dir)/templates/terminal/src
-wizard_files_DATA = main.c Makefile.am.tpl
+dist_wizard_files_DATA = main.c Makefile.am.tpl
-EXTRA_DIST = $(wizard_files_DATA)
-
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/vala-gtk/Makefile.am
b/plugins/project-wizard/templates/vala-gtk/Makefile.am
index 81b3f3d..b992d88 100644
--- a/plugins/project-wizard/templates/vala-gtk/Makefile.am
+++ b/plugins/project-wizard/templates/vala-gtk/Makefile.am
@@ -1,9 +1,7 @@
SUBDIRS = src
wizard_filesdir = $(anjuta_data_dir)/templates/vala-gtk
-wizard_files_DATA = \
+dist_wizard_files_DATA = \
configure.ac.tpl
-EXTRA_DIST = $(wizard_files_DATA)
-
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/vala-gtk/src/Makefile.am
b/plugins/project-wizard/templates/vala-gtk/src/Makefile.am
index 53fc78a..cf85efd 100644
--- a/plugins/project-wizard/templates/vala-gtk/src/Makefile.am
+++ b/plugins/project-wizard/templates/vala-gtk/src/Makefile.am
@@ -1,5 +1,4 @@
wizard_filesdir = $(anjuta_data_dir)/templates/vala-gtk/src
-wizard_files_DATA = main.vala Makefile.am.tpl project.ui config.vapi
-EXTRA_DIST = $(wizard_files_DATA)
+dist_wizard_files_DATA = main.vala Makefile.am.tpl project.ui config.vapi
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/wxwin/Makefile.am
b/plugins/project-wizard/templates/wxwin/Makefile.am
index 01bce5d..635f7ee 100644
--- a/plugins/project-wizard/templates/wxwin/Makefile.am
+++ b/plugins/project-wizard/templates/wxwin/Makefile.am
@@ -2,9 +2,7 @@
SUBDIRS = src po
wizard_filesdir = $(anjuta_data_dir)/templates/wxwin
-wizard_files_DATA = \
+dist_wizard_files_DATA = \
configure.ac.tpl
-EXTRA_DIST = $(wizard_files_DATA)
-
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/wxwin/po/Makefile.am
b/plugins/project-wizard/templates/wxwin/po/Makefile.am
index cd69737..a484cee 100644
--- a/plugins/project-wizard/templates/wxwin/po/Makefile.am
+++ b/plugins/project-wizard/templates/wxwin/po/Makefile.am
@@ -1,5 +1,4 @@
wizard_filesdir = $(anjuta_data_dir)/templates/wxwin/po
-wizard_files_DATA = POTFILES.in
-EXTRA_DIST = $(wizard_files_DATA)
+dist_wizard_files_DATA = POTFILES.in
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/wxwin/src/Makefile.am
b/plugins/project-wizard/templates/wxwin/src/Makefile.am
index 0684736..4ee4400 100644
--- a/plugins/project-wizard/templates/wxwin/src/Makefile.am
+++ b/plugins/project-wizard/templates/wxwin/src/Makefile.am
@@ -1,5 +1,4 @@
wizard_filesdir = $(anjuta_data_dir)/templates/wxwin/src
-wizard_files_DATA = main.cc Makefile.am.tpl
-EXTRA_DIST = $(wizard_files_DATA)
+dist_wizard_files_DATA = main.cc Makefile.am.tpl
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/xlib-dock/po/Makefile.am
b/plugins/project-wizard/templates/xlib-dock/po/Makefile.am
index c2f9eb5..98c947b 100644
--- a/plugins/project-wizard/templates/xlib-dock/po/Makefile.am
+++ b/plugins/project-wizard/templates/xlib-dock/po/Makefile.am
@@ -1,5 +1,4 @@
wizard_filesdir = $(anjuta_data_dir)/templates/xlib-dock/po
-wizard_files_DATA = POTFILES.in
-EXTRA_DIST = $(wizard_files_DATA)
+dist_wizard_files_DATA = POTFILES.in
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/xlib-dock/src/Makefile.am
b/plugins/project-wizard/templates/xlib-dock/src/Makefile.am
index 71dd1f2..341edb0 100644
--- a/plugins/project-wizard/templates/xlib-dock/src/Makefile.am
+++ b/plugins/project-wizard/templates/xlib-dock/src/Makefile.am
@@ -1,5 +1,4 @@
wizard_filesdir = $(anjuta_data_dir)/templates/xlib-dock/src
-wizard_files_DATA = main.c wmgeneral.c wmgeneral.h pixmaps.h Makefile.am.tpl
-EXTRA_DIST = $(wizard_files_DATA)
+dist_wizard_files_DATA = main.c wmgeneral.c wmgeneral.h pixmaps.h Makefile.am.tpl
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/xlib/Makefile.am
b/plugins/project-wizard/templates/xlib/Makefile.am
index e1d2389..d84a5ca 100644
--- a/plugins/project-wizard/templates/xlib/Makefile.am
+++ b/plugins/project-wizard/templates/xlib/Makefile.am
@@ -2,9 +2,7 @@
SUBDIRS = src po
wizard_filesdir = $(anjuta_data_dir)/templates/xlib
-wizard_files_DATA = \
+dist_wizard_files_DATA = \
configure.ac.tpl
-EXTRA_DIST = $(wizard_files_DATA)
-
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/xlib/po/Makefile.am
b/plugins/project-wizard/templates/xlib/po/Makefile.am
index 5820ce5..f801d0b 100644
--- a/plugins/project-wizard/templates/xlib/po/Makefile.am
+++ b/plugins/project-wizard/templates/xlib/po/Makefile.am
@@ -1,5 +1,4 @@
wizard_filesdir = $(anjuta_data_dir)/templates/xlib/po
-wizard_files_DATA = POTFILES.in
-EXTRA_DIST = $(wizard_files_DATA)
+dist_wizard_files_DATA = POTFILES.in
-include $(top_srcdir)/git.mk
diff --git a/plugins/project-wizard/templates/xlib/src/Makefile.am
b/plugins/project-wizard/templates/xlib/src/Makefile.am
index b34c054..7447961 100644
--- a/plugins/project-wizard/templates/xlib/src/Makefile.am
+++ b/plugins/project-wizard/templates/xlib/src/Makefile.am
@@ -1,5 +1,4 @@
wizard_filesdir = $(anjuta_data_dir)/templates/xlib/src
-wizard_files_DATA = main.c Makefile.am.tpl
-EXTRA_DIST = $(wizard_files_DATA)
+dist_wizard_files_DATA = main.c Makefile.am.tpl
-include $(top_srcdir)/git.mk
diff --git a/plugins/quick-open/Makefile.am b/plugins/quick-open/Makefile.am
index ca52a80..1612ab3 100755
--- a/plugins/quick-open/Makefile.am
+++ b/plugins/quick-open/Makefile.am
@@ -1,21 +1,21 @@
# Plugin glade file
quick_open_gladedir = $(anjuta_glade_dir)
-quick_open_glade_DATA = anjuta-quick-open.ui
+dist_quick_open_glade_DATA = anjuta-quick-open.ui
# Plugin UI file
quick_open_uidir = $(anjuta_ui_dir)
-quick_open_ui_DATA = anjuta-quick-open.xml
+dist_quick_open_ui_DATA = anjuta-quick-open.xml
# Plugin Icon file
quick_open_pixmapsdir = $(anjuta_image_dir)
-quick_open_pixmaps_DATA = anjuta-quick-open-48.png
+dist_quick_open_pixmaps_DATA = anjuta-quick-open-48.png
# Plugin description file
plugin_in_files = anjuta-quick-open.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
quick_open_plugindir = $(anjuta_plugin_dir)
-quick_open_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+dist_quick_open_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
plugindir = $(anjuta_plugin_dir)
plugin_LTLIBRARIES = libanjuta-quick-open.la
@@ -38,10 +38,6 @@ libanjuta_quick_open_la_SOURCES = \
EXTRA_DIST = \
$(plugin_in_files) \
- $(quick_open_plugin_DATA) \
- $(quick_open_ui_DATA) \
- $(quick_open_pixmaps_DATA) \
- $(quick_open_glade_DATA) \
$(schema_in_files)
-include $(top_srcdir)/git.mk
diff --git a/plugins/run-program/Makefile.am b/plugins/run-program/Makefile.am
index ecb94eb..35ed2c5 100644
--- a/plugins/run-program/Makefile.am
+++ b/plugins/run-program/Makefile.am
@@ -1,14 +1,14 @@
# Plugin glade file
anjuta_gladedir = $(anjuta_glade_dir)
-anjuta_glade_DATA = anjuta-run-program.ui
+dist_anjuta_glade_DATA = anjuta-run-program.ui
# Plugin UI file
anjuta_uidir = $(anjuta_ui_dir)
-anjuta_ui_DATA = anjuta-run-program.xml
+dist_anjuta_ui_DATA = anjuta-run-program.xml
# Plugin Icon file
anjuta_pixmapsdir = $(anjuta_image_dir)
-anjuta_pixmaps_DATA = \
+dist_anjuta_pixmaps_DATA = \
anjuta-run-program-48.png
gsettings_in_file = org.gnome.anjuta.plugins.run.gschema.xml.in
@@ -21,7 +21,7 @@ plugin_in_files = anjuta-run-program.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
anjuta_plugindir = $(anjuta_plugin_dir)
-anjuta_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+dist_anjuta_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
plugindir = $(anjuta_plugin_dir)
plugin_LTLIBRARIES = libanjuta-run-program.la
@@ -48,10 +48,6 @@ libanjuta_run_program_la_SOURCES = \
EXTRA_DIST = \
$(plugin_in_files) \
- $(anjuta_pixmaps_DATA) \
- $(anjuta_plugin_DATA) \
- $(anjuta_ui_DATA) \
- $(anjuta_glade_DATA) \
$(gsettings_in_file)
CLEANFILES = \
diff --git a/plugins/snippets-manager/Makefile.am b/plugins/snippets-manager/Makefile.am
index 8e10406..95d83d3 100644
--- a/plugins/snippets-manager/Makefile.am
+++ b/plugins/snippets-manager/Makefile.am
@@ -1,7 +1,7 @@
# Plugin glade file
# Snippet Browser and Snippet Editor UI files here
snippets_manager_gladedir = $(anjuta_glade_dir)
-snippets_manager_glade_DATA = snippets-manager-preferences.ui \
+dist_snippets_manager_glade_DATA = snippets-manager-preferences.ui \
snippets-browser.ui \
snippets-editor.ui \
snippets-export-dialog.ui
@@ -10,25 +10,25 @@ snippets_manager_glade_DATA = snippets-manager-preferences.ui \
# Plugin default data
# The default installed plugins here.
default_snippetsdir = $(anjuta_data_dir)
-default_snippets_DATA = \
+dist_default_snippets_DATA = \
snippets.anjuta-snippets \
snippets-global-variables.xml
snippets_manager_pixmapsdir = $(anjuta_image_dir)
-snippets_manager_pixmaps_DATA = \
+dist_snippets_manager_pixmaps_DATA = \
anjuta-snippets-manager.png
# Plugin menu UI file
snippets_manager_uidir = $(anjuta_ui_dir)
-snippets_manager_ui_DATA = \
+dist_snippets_manager_ui_DATA = \
snippets-manager-ui.xml
plugin_in_files = anjuta-snippets-manager.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
snippets_manager_plugindir = $(anjuta_plugin_dir)
-snippets_manager_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+dist_snippets_manager_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
AM_CPPFLAGS= \
$(WARN_CFLAGS) \
@@ -79,11 +79,6 @@ gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
EXTRA_DIST = \
$(plugin_in_files) \
- $(snippets_manager_pixmaps_DATA) \
- $(snippets_manager_plugin_DATA) \
- $(snippets_manager_glade_DATA) \
- $(default_snippets_DATA) \
- $(snippets_manager_ui_DATA) \
$(gsettings_in_file)
CLEANFILES = \
diff --git a/plugins/sourceview/Makefile.am b/plugins/sourceview/Makefile.am
index e0e2bda..247595d 100644
--- a/plugins/sourceview/Makefile.am
+++ b/plugins/sourceview/Makefile.am
@@ -1,14 +1,14 @@
# Plugin glade file
sourceview_xmldir = $(anjuta_glade_dir)
-sourceview_xml_DATA = anjuta-editor-sourceview.ui
+dist_sourceview_xml_DATA = anjuta-editor-sourceview.ui
# Plugin UI file
sourceview_uidir = $(anjuta_ui_dir)
-sourceview_ui_DATA = anjuta-sourceview.xml
+dist_sourceview_ui_DATA = anjuta-sourceview.xml
# Plugin Icon file
sourceview_pixmapsdir = $(anjuta_image_dir)
-sourceview_pixmaps_DATA = \
+dist_sourceview_pixmaps_DATA = \
anjuta-editor-sourceview-plugin-48.png \
anjuta-linemark-16.png \
anjuta-pcmark-16.png \
@@ -22,7 +22,7 @@ plugin_in_files = sourceview.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
sourceview_plugindir = $(anjuta_plugin_dir)
-sourceview_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+dist_sourceview_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
AM_CPPFLAGS = \
$(WARN_CFLAGS) \
@@ -89,10 +89,6 @@ gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
EXTRA_DIST = \
anjuta-marshal.list \
$(plugin_in_files) \
- $(sourceview_plugin_DATA) \
- $(sourceview_ui_DATA) \
- $(sourceview_pixmaps_DATA) \
- $(sourceview_xml_DATA) \
$(gsettings_in_file)
CLEANFILES = \
diff --git a/plugins/starter/Makefile.am b/plugins/starter/Makefile.am
index 8b3d446..6c81a7e 100644
--- a/plugins/starter/Makefile.am
+++ b/plugins/starter/Makefile.am
@@ -3,7 +3,7 @@ plugin_in_files = anjuta-starter.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
starter_plugindir = $(anjuta_plugin_dir)
-starter_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+dist_starter_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
plugindir = $(anjuta_plugin_dir)
plugin_LTLIBRARIES = libanjuta-starter.la
@@ -39,8 +39,6 @@ CLEANFILES = \
EXTRA_DIST = \
$(plugin_in_files) \
- $(starter_plugin_DATA) \
- $(starter_pixmaps_DATA) \
starter.gresource.xml \
starter.ui
diff --git a/plugins/symbol-db/Makefile.am b/plugins/symbol-db/Makefile.am
index 9e99e91..4be13c6 100644
--- a/plugins/symbol-db/Makefile.am
+++ b/plugins/symbol-db/Makefile.am
@@ -1,19 +1,19 @@
SUBDIRS = . anjuta-tags images benchmark
symbol_db_datadir = $(anjuta_data_dir)
-symbol_db_data_DATA = tables.sql
+dist_symbol_db_data_DATA = tables.sql
# Plugin UI file
symbol_db_uidir = $(anjuta_ui_dir)
-symbol_db_ui_DATA = anjuta-symbol-db-plugin.xml
+dist_symbol_db_ui_DATA = anjuta-symbol-db-plugin.xml
# Plugin Glade file
symbol_db_gladedir = $(anjuta_glade_dir)
-symbol_db_glade_DATA = anjuta-symbol-db.ui
+dist_symbol_db_glade_DATA = anjuta-symbol-db.ui
# Plugin Icon file
symbol_db_pixmapsdir = $(anjuta_image_dir)
-symbol_db_pixmaps_DATA = \
+dist_symbol_db_pixmaps_DATA = \
anjuta-symbol-db-plugin.svg \
anjuta-symbol-db-plugin-48.png \
anjuta-symbol-db-plugin-16.png
@@ -23,7 +23,7 @@ plugin_in_files = symbol-db.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
symbol_db_plugindir = $(anjuta_plugin_dir)
-symbol_db_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+dist_symbol_db_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
# NOTE :
# The naming convention is very intentional
@@ -109,11 +109,6 @@ gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
EXTRA_DIST = \
$(plugin_in_files) \
- $(symbol_db_plugin_DATA) \
- $(symbol_db_glade_DATA) \
- $(symbol_db_pixmaps_DATA) \
- $(symbol_db_data_DATA) \
- $(symbol_db_ui_DATA) \
symbol-db-marshal.list \
$(gsettings_in_file)
diff --git a/plugins/terminal/Makefile.am b/plugins/terminal/Makefile.am
index 7439e62..d4ab110 100644
--- a/plugins/terminal/Makefile.am
+++ b/plugins/terminal/Makefile.am
@@ -1,14 +1,14 @@
# Plugin glade file
terminal_gladedir = $(anjuta_glade_dir)
-terminal_glade_DATA = anjuta-terminal-plugin.ui
+dist_terminal_glade_DATA = anjuta-terminal-plugin.ui
# Plugin ui file
terminal_uidir = $(anjuta_ui_dir)
-terminal_ui_DATA = anjuta-terminal-plugin.xml
+dist_terminal_ui_DATA = anjuta-terminal-plugin.xml
# Plugin Icon file
terminal_pixmapsdir = $(anjuta_image_dir)
-terminal_pixmaps_DATA = \
+dist_terminal_pixmaps_DATA = \
anjuta-terminal-plugin.svg \
anjuta-terminal-plugin-48.png
@@ -17,7 +17,7 @@ plugin_in_files = anjuta-terminal.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
terminal_plugindir = $(anjuta_plugin_dir)
-terminal_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+dist_terminal_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
# Include paths
AM_CPPFLAGS = \
@@ -49,10 +49,6 @@ gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
EXTRA_DIST = \
$(plugin_in_files) \
- $(terminal_plugin_DATA) \
- $(terminal_pixmaps_DATA) \
- $(terminal_ui_DATA) \
- $(terminal_glade_DATA) \
$(gsettings_in_file)
CLEANFILES = \
diff --git a/plugins/tools/Makefile.am b/plugins/tools/Makefile.am
index 6f4c963..a78f5b4 100644
--- a/plugins/tools/Makefile.am
+++ b/plugins/tools/Makefile.am
@@ -1,15 +1,15 @@
# Plugin glade file
tools_gladedir = $(anjuta_glade_dir)
-tools_glade_DATA = anjuta-tools.ui
+dist_tools_glade_DATA = anjuta-tools.ui
# Plugin UI file
tools_uidir = $(anjuta_ui_dir)
-tools_ui_DATA = anjuta-tools.xml
+dist_tools_ui_DATA = anjuta-tools.xml
# Plugin pixmaps
tools_pixmapsdir = $(anjuta_image_dir)
-tools_pixmaps_DATA = \
+dist_tools_pixmaps_DATA = \
anjuta-tools-plugin.svg \
anjuta-tools-plugin-48.png
@@ -18,7 +18,7 @@ plugin_in_files = anjuta-tools.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
tools_plugindir = $(anjuta_plugin_dir)
-tools_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+dist_tools_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
plugindir = $(anjuta_plugin_dir)
plugin_LTLIBRARIES = libanjuta-tools.la
@@ -56,10 +56,6 @@ gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
EXTRA_DIST = \
$(plugin_in_files) \
- $(tools_pixmaps_DATA) \
- $(tools_plugin_DATA) \
- $(tools_glade_DATA) \
- $(tools_ui_DATA) \
$(gsettings_in_file)
CLEANFILES = \
diff --git a/plugins/tools/scripts/Makefile.am b/plugins/tools/scripts/Makefile.am
index 287c28a..9f26b33 100644
--- a/plugins/tools/scripts/Makefile.am
+++ b/plugins/tools/scripts/Makefile.am
@@ -2,15 +2,13 @@
toolsdir = $(anjuta_data_dir)/tools
-tools_SCRIPTS = \
+dist_tools_SCRIPTS = \
prepare-changelog.pl \
find-fixmes.pl \
translation-status.pl
-tools_DATA = tools-2.xml
+dist_tools_DATA = tools-2.xml
EXTRA_DIST = \
- $(tools_SCRIPTS) \
- $(tools_DATA) \
tools-2.xml.in
# from the autoconf manual
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 00ae7db..fdc0110 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,7 +1,5 @@
anjuta_datadir = $(anjuta_data_dir)
-anjuta_data_DATA = anjuta_project.template
-
-EXTRA_DIST = $(anjuta_data_DATA)
+dist_anjuta_data_DATA = anjuta_project.template
-include $(top_srcdir)/git.mk
diff --git a/src/Makefile.am b/src/Makefile.am
index da469c4..056d279 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,17 +1,16 @@
## Process this file with automake to produce Makefile.in
anjuta_gladedir = $(anjuta_glade_dir)
-anjuta_glade_DATA = preferences.ui
+dist_anjuta_glade_DATA = preferences.ui
anjuta_uidir = $(anjuta_ui_dir)
-anjuta_ui_DATA = anjuta.xml
+dist_anjuta_ui_DATA = anjuta.xml
anjuta_layoutdir = $(anjuta_data_dir)
-anjuta_layout_DATA = layout.xml
+dist_anjuta_layout_DATA = layout.xml
anjuta_pixmapsdir = $(anjuta_image_dir)
-
-anjuta_pixmaps_DATA = \
+dist_anjuta_pixmaps_DATA = \
anjuta-preferences-general.svg \
anjuta-preferences-general-48.png
@@ -66,11 +65,7 @@ anjuta_shell_LDADD = \
$(GDL_LIBS)
EXTRA_DIST = \
- $(anjuta_ui_DATA) \
anjuta-shell.ui \
- $(anjuta_layout_DATA) \
- $(anjuta_glade_DATA) \
- $(anjuta_pixmaps_DATA) \
$(gsettings_in_file)
CLEANFILES = \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
