[gitg/wip/release: 9/21] Namespace make variables

[Jesse van den Kieboom <jessevdk src gnome org>]

commit 153f5995ef25f29e032692043fa5ebb4110bad85
Author: Jesse van den Kieboom <jessevdk gmail com>
Date:   Fri Jan 3 19:39:36 2014 +0100

    Namespace make variables

 gitg/Makefile.am          |    2 +-
 libgitg-ext/Makefile.am   |   31 ++++++++++++++-----------------
 libgitg/Makefile.am       |   34 ++++++++++++++++++----------------
 plugins/diff/Makefile.am  |   20 ++++++++++----------
 plugins/files/Makefile.am |   20 ++++++++++----------
 5 files changed, 53 insertions(+), 54 deletions(-)
---
diff --git a/gitg/Makefile.am b/gitg/Makefile.am
index 6fe4832..9164552 100644
--- a/gitg/Makefile.am
+++ b/gitg/Makefile.am
@@ -69,7 +69,7 @@ gitg_VALASOURCES =                                            \
        commit/gitg-commit-dialog.vala
 
 gitg_SOURCES =                                                 \
-       $(VALASOURCES)                                          \
+       $(gitg_VALASOURCES)                                     \
        gitg-resources.c
 
 gitg-resources.c: resources/gitg-resources.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies 
--sourcedir $(srcdir)/resources resources/gitg-resources.xml)
diff --git a/libgitg-ext/Makefile.am b/libgitg-ext/Makefile.am
index 8daa335..35c6efe 100644
--- a/libgitg-ext/Makefile.am
+++ b/libgitg-ext/Makefile.am
@@ -40,7 +40,7 @@ libgitg_ext_1_0_la_LDFLAGS =                  \
 
 libgitg_ext_1_0_la_LIBADD = $(LIBGITG_EXT_LIBS)
 
-VALA_FILES =                                   \
+libgitg_ext_1_0_la_VALA_FILES =                        \
        gitg-ext-assembly-info.vala             \
        gitg-ext-application.vala               \
        gitg-ext-ui-element.vala                \
@@ -54,8 +54,8 @@ VALA_FILES =                                  \
        gitg-ext-preferences.vala               \
        gitg-ext-ui.vala
 
-libgitg_ext_1_0_la_SOURCES =           \
-       $(VALA_FILES)                   \
+libgitg_ext_1_0_la_SOURCES =                   \
+       $(libgitg_ext_1_0_la_VALA_FILES)        \
        gitg-ext-resources.c
 
 headerdir = $(prefix)/include/libgitg-ext-1.0/libgitg-ext
@@ -78,11 +78,11 @@ else
 docs:
 endif
 
-girdir = $(INTROSPECTION_GIRDIR)
-gir_DATA = GitgExt-1.0.gir
+libgitg_ext_1_0_la_girdir = $(INTROSPECTION_GIRDIR)
+libgitg_ext_1_0_la_gir_DATA = GitgExt-1.0.gir
 
-typelibdir = $(INTROSPECTION_TYPELIBDIR)
-typelib_DATA = GitgExt-1.0.typelib
+libgitg_ext_1_0_la_typelibdir = $(INTROSPECTION_TYPELIBDIR)
+libgitg_ext_1_0_la_typelib_DATA = GitgExt-1.0.typelib
 
 %.typelib: %.gir
        $(INTROSPECTION_COMPILER) $(INTROSPECTION_COMPILER_ARGS) --includedir=. 
--includedir=$(top_builddir)/libgitg -o $@ $<
@@ -93,8 +93,8 @@ overrides_PYTHON = \
        GitgExt.py
 endif
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgitg-ext-1.0.pc
+libgitg_ext_1_0_la_pkgconfigdir = $(libdir)/pkgconfig
+libgitg_ext_1_0_la_pkgconfig_DATA = libgitg-ext-1.0.pc
 
 gitg-ext-resources.c: resources/resources.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies 
--sourcedir $(srcdir)/resources resources/resources.xml)
        $(GLIB_COMPILE_RESOURCES) --generate-source     \
@@ -106,15 +106,12 @@ gitg-ext-resources.h: resources/resources.xml $(shell $(GLIB_COMPILE_RESOURCES)
                --sourcedir $(srcdir)/resources         \
                --target "$@" "$<"
 
+CLEANFILES = $(libgitg_ext_1_0_la_typelib_DATA)
 
-EXTRA_DIST =                           \
-       $(pkgconfig_DATA)               \
-       resources/resources.xml         \
-       $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir)/resources 
resources/resources.xml)
-
-CLEANFILES =                                   \
-       GitgExt-1.0.typelib                     \
-
+EXTRA_DIST =                                   \
+       $(libgitg_ext_1_0_la_pkgconfig_DATA)    \
+       resources/resources.xml                 \
+       $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir)/resources 
$(srcdir)/resources/resources.xml)
 
 -include $(top_srcdir)/git.mk
 -include $(top_srcdir)/valadoc.mk
diff --git a/libgitg/Makefile.am b/libgitg/Makefile.am
index d0a7812..68f4466 100644
--- a/libgitg/Makefile.am
+++ b/libgitg/Makefile.am
@@ -39,7 +39,7 @@ libgitg_1_0_la_VALAFLAGS =            \
        --library libgitg-1.0           \
        --gresources "$(top_srcdir)/libgitg/resources/resources.xml"
 
-VALA_FILES =                                   \
+libgitg_1_0_la_VALA_FILES =                    \
        gitg-assembly-info.vala                 \
        gitg-async.vala                         \
        gitg-branch.vala                        \
@@ -73,35 +73,37 @@ VALA_FILES =                                        \
        gitg-diff-stat.vala
 
 libgitg_1_0_la_SOURCES =               \
+       $(libgitg_1_0_la_VALA_FILES)    \
        gitg-resources.c                \
-       gitg-js-utils.c                 \
-       $(VALA_FILES)
+       gitg-js-utils.c
 
-headerdir = $(prefix)/include/libgitg-1.0/libgitg
-header_HEADERS = libgitg.h gitg-js-utils.h
+libgitg_1_0_la_headerdir = $(prefix)/include/libgitg-1.0/libgitg
+libgitg_1_0_la_header_HEADERS = libgitg.h
 
-vapidir = $(prefix)/share/vala/vapi
-vapi_DATA = libgitg-1.0.vapi
+noinst_HEADERS = gitg-js-utils.h
 
-girdir = $(INTROSPECTION_GIRDIR)
-gir_DATA = Gitg-1.0.gir
+libgitg_1_0_la_vapidir = $(prefix)/share/vala/vapi
+libgitg_1_0_la_vapi_DATA = libgitg-1.0.vapi
 
-typelibdir = $(INTROSPECTION_TYPELIBDIR)
-typelib_DATA = Gitg-1.0.typelib
+libgitg_1_0_la_girdir = $(INTROSPECTION_GIRDIR)
+libgitg_1_0_la_gir_DATA = Gitg-1.0.gir
+
+libgitg_1_0_la_typelibdir = $(INTROSPECTION_TYPELIBDIR)
+libgitg_1_0_la_typelib_DATA = Gitg-1.0.typelib
 
 %.typelib: %.gir
        $(INTROSPECTION_COMPILER) $(INTROSPECTION_COMPILER_ARGS) --includedir=. -o $@ $<
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgitg-1.0.pc
+libgitg_1_0_la_pkgconfigdir = $(libdir)/pkgconfig
+libgitg_1_0_la_pkgconfig_DATA = libgitg-1.0.pc
 
 gitg-resources.c: resources/resources.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies 
--sourcedir $(srcdir)/resources $(srcdir)/resources/resources.xml)
        $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target="$@" --sourcedir=$(srcdir)/resources --generate-source 
$(srcdir)/resources/resources.xml
 
 
-EXTRA_DIST = \
-       $(pkgconfig_DATA)               \
-       resources/resources.xml         \
+EXTRA_DIST =                                   \
+       $(libgitg_1_0_la_pkgconfig_DATA)        \
+       resources/resources.xml                 \
        $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir)/resources 
$(srcdir)/resources/resources.xml)
 
 -include $(top_srcdir)/git.mk
diff --git a/plugins/diff/Makefile.am b/plugins/diff/Makefile.am
index 1f974a8..f2625eb 100644
--- a/plugins/diff/Makefile.am
+++ b/plugins/diff/Makefile.am
@@ -6,26 +6,25 @@ libdiff_la_CPPFLAGS =                                                 \
        -DDATADIR=\""$(datadir)"\"                                      \
        -DLIBDIR=\""$(libdir)"\"
 
-plugindir = $(GITG_PLUGIN_LIBDIR)
-plugin_LTLIBRARIES = libdiff.la
-plugin_DATA = diff.plugin
-
-VALA_SOURCES =                                                         \
-       gitg-diff.vala
 libdiff_la_CFLAGS =                                                    \
        $(GITG_PLUGIN_CFLAGS)                                           \
        $(WARN_CFLAGS)                                                  \
        -w
 
 libdiff_la_LDFLAGS = $(GITG_PLUGIN_LIBTOOL_FLAGS)
-
 libdiff_la_LIBADD = $(GITG_PLUGIN_LIBS)
 libdiff_la_VALAFLAGS = $(GITG_PLUGIN_VALAFLAGS)
 
-libdiff_la_SOURCES =                           \
-       $(VALA_SOURCES)                         \
+libdiff_la_VALASOURCES =                                               \
+       gitg-diff.vala
+
+libdiff_la_SOURCES =                                                   \
+       $(libdiff_la_VALASOURCES)                                       \
        gitg-diff-resources.c
 
+libdiff_la_plugindir = $(GITG_PLUGIN_LIBDIR)
+libdiff_la_plugin_LTLIBRARIES = libdiff.la
+libdiff_la_plugin_DATA = diff.plugin
 
 gitg-diff-resources.c: resources/resources.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies 
--sourcedir $(srcdir)/resources resources/resources.xml)
        $(GLIB_COMPILE_RESOURCES) --generate-source     \
@@ -37,7 +36,8 @@ gitg-diff-resources.h: resources/resources.xml $(shell $(GLIB_COMPILE_RESOURCES)
                --sourcedir $(srcdir)/resources         \
                --target "$@" "$<"
 
-EXTRA_DIST = $(plugin_DATA)                    \
+EXTRA_DIST =                                   \
+       $(libdiff_la_plugin_DATA)               \
        resources/resources.xml                 \
        $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir)/resources 
resources/resources.xml)
 
diff --git a/plugins/files/Makefile.am b/plugins/files/Makefile.am
index ea181da..e352941 100644
--- a/plugins/files/Makefile.am
+++ b/plugins/files/Makefile.am
@@ -4,13 +4,6 @@ libfiles_la_CPPFLAGS =                                                 \
        -DDATADIR=\""$(datadir)"\"                                      \
        -DLIBDIR=\""$(libdir)"\"
 
-plugindir = $(GITG_PLUGIN_LIBDIR)
-plugin_LTLIBRARIES = libfiles.la
-plugin_DATA = files.plugin
-
-VALA_SOURCES =                                                         \
-       gitg-files.vala                                                 \
-       gitg-files-tree-store.vala
 libfiles_la_CFLAGS =                                                   \
        $(GITG_PLUGIN_CFLAGS)                                           \
        $(WARN_CFLAGS)                                                  \
@@ -20,11 +13,17 @@ libfiles_la_LDFLAGS = $(GITG_PLUGIN_LIBTOOL_FLAGS)
 libfiles_la_LIBADD = $(GITG_PLUGIN_LIBS)
 libfiles_la_VALAFLAGS = $(GITG_PLUGIN_VALAFLAGS)
 
+libfiles_la_VALASOURCES =                                              \
+       gitg-files.vala                                                 \
+       gitg-files-tree-store.vala
 
-libfiles_la_SOURCES =                          \
-       $(VALA_SOURCES)                         \
+libfiles_la_SOURCES =                                                  \
+       $(libfiles_la_VALASOURCES)                                      \
        gitg-files-resources.c
 
+libfiles_la_plugindir = $(GITG_PLUGIN_LIBDIR)
+libfiles_la_plugin_LTLIBRARIES = libfiles.la
+libfiles_la_plugin_DATA = files.plugin
 
 gitg-files-resources.c: resources/resources.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies 
--sourcedir $(srcdir)/resources resources/resources.xml)
        $(GLIB_COMPILE_RESOURCES) --generate-source     \
@@ -36,7 +35,8 @@ gitg-files-resources.h: resources/resources.xml $(shell $(GLIB_COMPILE_RESOURCES
                --sourcedir $(srcdir)/resources         \
                --target "$@" "$<"
 
-EXTRA_DIST = $(plugin_DATA)                    \
+EXTRA_DIST =                                   \
+       $(libfiles_la_plugin_DATA)              \
        resources/resources.xml                 \
        $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir)/resources 
resources/resources.xml)