GNOME.org
 

[gitg] Use non-recursive make to build plugins

commit c11657dc9a5170c63e62c5195c73a5cad1838fc7
Author: Jesse van den Kieboom <jessevdk gmail com>
Date:   Sat Jan 4 15:16:04 2014 +0100

    Use non-recursive make to build plugins

 Makefile.am                    |    6 +++-
 configure.ac                   |    4 ---
 icons.mk                       |   11 +++----
 plugins/Makefile.am            |    5 +--
 plugins/diff/Makefile.am       |   54 ++++++++++++++++++--------------------
 plugins/diff/icons/Makefile.am |    5 +---
 plugins/files/Makefile.am      |   56 ++++++++++++++++++---------------------
 7 files changed, 64 insertions(+), 77 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index aa44910..c965b18 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 
 ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS}
 
-SUBDIRS = libgd plugins data po tests
+SUBDIRS = libgd data po tests
 
 DISTCLEANFILES = \
        intltool-extract \
@@ -83,11 +83,15 @@ GITIGNOREFILES  =
 CLEANFILES      =
 lib_LTLIBRARIES =
 bin_PROGRAMS    =
+SCALABLE_ICONS  =
 
 include libgitg/Makefile.am
 include libgitg-ext/Makefile.am
+include plugins/Makefile.am
 include gitg/Makefile.am
 
+include icons.mk
+
 %.typelib: %.gir
        $(INTROSPECTION_COMPILER) $(INTROSPECTION_COMPILER_ARGS) --includedir=. -o $@ $<
 
diff --git a/configure.ac b/configure.ac
index 7854479..ffb7183 100644
--- a/configure.ac
+++ b/configure.ac
@@ -294,10 +294,6 @@ data/org.gnome.gitg.gschema.xml.in
 po/Makefile.in
 tests/Makefile
 tests/libgitg/Makefile
-plugins/Makefile
-plugins/diff/Makefile
-plugins/diff/icons/Makefile
-plugins/files/Makefile
 ])
 
 AC_OUTPUT
diff --git a/icons.mk b/icons.mk
index cd6e7be..f7d7691 100644
--- a/icons.mk
+++ b/icons.mk
@@ -1,8 +1,8 @@
-baseicondir = $(datadir)/gitg/icons/hicolor
-svgicondir = $(baseicondir)/scalable/actions
-svgicon_DATA = $(ICONS)
+baseiconsdir = $(datadir)/gitg/icons/hicolor
+scalableiconsdir = $(baseiconsdir)/scalable/actions
+scalableicons_DATA = $(SCALABLE_ICONS)
 
-gtk_update_icon_cache = $(GTK_UPDATE_ICON_CACHE) -f -t $(baseicondir)
+gtk_update_icon_cache = $(GTK_UPDATE_ICON_CACHE) -f -t $(baseiconsdir)
 
 install-data-hook: update-icon-cache
 uninstall-hook: update-icon-cache
@@ -16,5 +16,4 @@ update-icon-cache:
                echo "***   $(gtk_update_icon_cache)"; \
        fi
 
-EXTRA_DIST = \
-       $(svgicon_DATA)
+EXTRA_DIST += $(scalableicons_DATA)
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 7745b4e..020d28d 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,5 +1,4 @@
-SUBDIRS = diff files
-
--include $(top_srcdir)/git.mk
+include plugins/diff/Makefile.am
+include plugins/files/Makefile.am
 
 # vi:ts=8:noet
diff --git a/plugins/diff/Makefile.am b/plugins/diff/Makefile.am
index 1b2cf0b..b61f62b 100644
--- a/plugins/diff/Makefile.am
+++ b/plugins/diff/Makefile.am
@@ -1,48 +1,44 @@
-SUBDIRS = icons
+plugins_diff_libdiff_la_plugindir = $(GITG_PLUGIN_LIBDIR)
+plugins_diff_libdiff_la_plugin_LTLIBRARIES = plugins/diff/libdiff.la
+plugins_diff_libdiff_la_plugin_DATA = plugins/diff/diff.plugin
 
-libdiff_la_CPPFLAGS =                                                  \
+plugins_diff_libdiff_la_CPPFLAGS =                                     \
        -I$(top_srcdir)                                                 \
        -I$(srcdir)                                                     \
        -DDATADIR=\""$(datadir)"\"                                      \
        -DLIBDIR=\""$(libdir)"\"
 
-libdiff_la_CFLAGS =                                                    \
+plugins_diff_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)
+plugins_diff_libdiff_la_LDFLAGS = $(GITG_PLUGIN_LIBTOOL_FLAGS)
+plugins_diff_libdiff_la_LIBADD = $(GITG_PLUGIN_LIBS)
+plugins_diff_libdiff_la_VALAFLAGS = $(GITG_PLUGIN_VALAFLAGS)
 
-libdiff_la_VALASOURCES =                                               \
-       gitg-diff.vala
+plugins_diff_libdiff_la_VALASOURCES =                                  \
+       plugins/diff/gitg-diff.vala
 
-libdiff_la_SOURCES =                                                   \
-       $(libdiff_la_VALASOURCES)                                       \
-       gitg-diff-resources.c
+plugins_diff_libdiff_la_SOURCES =                                      \
+       $(plugins_diff_libdiff_la_VALASOURCES)                          \
+       plugins/diff/gitg-diff-resources.c
 
-libdiff_la_plugindir = $(GITG_PLUGIN_LIBDIR)
-libdiff_la_plugin_LTLIBRARIES = libdiff.la
-libdiff_la_plugin_DATA = diff.plugin
+plugins_diff_libdiff_resources_deps = $(call GRESDEPS,plugins/diff/resources/resources.xml)
+plugins/diff/gitg-diff-resources.c: $(plugins_diff_libdiff_resources_deps)
+       $(GRESGEN)
 
-gitg-diff-resources.c: resources/resources.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies 
--sourcedir $(srcdir)/resources $(srcdir)/resources/resources.xml)
-       $(GLIB_COMPILE_RESOURCES) --generate-source     \
-               --sourcedir $(srcdir)/resources         \
-               --target "$@" "$<"
+GITIGNOREFILES +=                                              \
+       $(plugins_diff_libdiff_la_VALASOURCES:%.vala=%.c)       \
+       plugins_diff_libdiff_la_vala.stamp
 
-GITIGNOREFILES =                               \
-       $(libdiff_la_VALASOURCES:%.vala=%.c)    \
-       libdiff_la_vala.stamp
+CLEANFILES +=                                  \
+       plugins/diff/gitg-diff-resources.c
 
-CLEANFILES =                                   \
-       gitg-diff-resources.c
+EXTRA_DIST +=                                          \
+       $(plugins_diff_libdiff_la_plugin_DATA)          \
+       $(plugins_diff_libdiff_resources_deps)
 
-EXTRA_DIST =                                   \
-       $(libdiff_la_plugin_DATA)               \
-       resources/resources.xml                 \
-       $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir)/resources 
$(srcdir)/resources/resources.xml)
-
--include $(top_srcdir)/git.mk
+SCALABLE_ICONS += plugins/diff/icons/diff-symbolic.svg
 
 # vi:ts=8:noet
diff --git a/plugins/diff/icons/Makefile.am b/plugins/diff/icons/Makefile.am
index aa05b63..504c42a 100644
--- a/plugins/diff/icons/Makefile.am
+++ b/plugins/diff/icons/Makefile.am
@@ -1,6 +1,3 @@
-ICONS = diff-symbolic.svg
-
-include $(top_srcdir)/icons.mk
--include $(top_srcdir)/git.mk
+ICONS += diff-symbolic.svg
 
 # vi:ts=8:noet
diff --git a/plugins/files/Makefile.am b/plugins/files/Makefile.am
index 476b9e3..98f89b7 100644
--- a/plugins/files/Makefile.am
+++ b/plugins/files/Makefile.am
@@ -1,47 +1,43 @@
-libfiles_la_CPPFLAGS =                                                 \
+plugins_files_libfiles_la_plugindir = $(GITG_PLUGIN_LIBDIR)
+plugins_files_libfiles_la_plugin_LTLIBRARIES = plugins/files/libfiles.la
+plugins_files_libfiles_la_plugin_DATA = plugins/files/files.plugin
+
+plugins_files_libfiles_la_CPPFLAGS =                                   \
        -I$(top_srcdir)                                                 \
        -I$(srcdir)                                                     \
        -DDATADIR=\""$(datadir)"\"                                      \
        -DLIBDIR=\""$(libdir)"\"
 
-libfiles_la_CFLAGS =                                                   \
+plugins_files_libfiles_la_CFLAGS =                                     \
        $(GITG_PLUGIN_CFLAGS)                                           \
        $(WARN_CFLAGS)                                                  \
        -w
 
-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 =                                                  \
-       $(libfiles_la_VALASOURCES)                                      \
-       gitg-files-resources.c
+plugins_files_libfiles_la_LDFLAGS = $(GITG_PLUGIN_LIBTOOL_FLAGS)
+plugins_files_libfiles_la_LIBADD = $(GITG_PLUGIN_LIBS)
+plugins_files_libfiles_la_VALAFLAGS = $(GITG_PLUGIN_VALAFLAGS)
 
-libfiles_la_plugindir = $(GITG_PLUGIN_LIBDIR)
-libfiles_la_plugin_LTLIBRARIES = libfiles.la
-libfiles_la_plugin_DATA = files.plugin
+plugins_files_libfiles_la_VALASOURCES =                                        \
+       plugins/files/gitg-files.vala                                   \
+       plugins/files/gitg-files-tree-store.vala
 
-gitg-files-resources.c: resources/resources.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies 
--sourcedir $(srcdir)/resources $(srcdir)/resources/resources.xml)
-       $(GLIB_COMPILE_RESOURCES) --generate-source     \
-               --sourcedir $(srcdir)/resources         \
-               --target "$@" "$<"
+plugins_files_libfiles_la_SOURCES =                                    \
+       $(plugins_files_libfiles_la_VALASOURCES)                        \
+       plugins/files/gitg-files-resources.c
 
-GITIGNOREFILES =                               \
-       $(libfiles_la_VALASOURCES:%.vala=%.c)   \
-       libfiles_la_vala.stamp
+plugins_files_libfiles_resources_deps = $(call GRESDEPS,plugins/files/resources/resources.xml)
+plugins/files/gitg-files-resources.c: $(plugins_files_libfiles_resources_deps)
+       $(GRESGEN)
 
-CLEANFILES =                                   \
-       gitg-files-resources.c
+GITIGNOREFILES +=                                              \
+       $(plugins_files_libfiles_la_VALASOURCES:%.vala=%.c)     \
+       plugins_files_libfiles_la_vala.stamp
 
-EXTRA_DIST =                                   \
-       $(libfiles_la_plugin_DATA)              \
-       resources/resources.xml                 \
-       $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir)/resources 
$(srcdir)/resources/resources.xml)
+CLEANFILES +=                                                  \
+       plugins/files/gitg-files-resources.c
 
--include $(top_srcdir)/git.mk
+EXTRA_DIST +=                                                  \
+       $(plugins_files_libfiles_la_plugin_DATA)                \
+       $(plugins_files_libfiles_resources_deps)
 
 # vi:ts=8:noet
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]