Use non-recursive make to build plugins

2024-10-01 05:33:49 +00:00 · 2014-01-04 15:16:04 +01:00 · 2014-01-04 15:16:04 +01:00 · c11657dc9a
parent ab581c9584
commit c11657dc9a
7 changed files with 64 additions and 77 deletions
--- 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 $@ $<

--- 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
--- 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)
--- 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
--- 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
--- 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
--- 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)
+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_VALASOURCES =						\
-	gitg-files.vala							\
-	gitg-files-tree-store.vala
+plugins_files_libfiles_la_VALASOURCES =					\
+	plugins/files/gitg-files.vala					\
+	plugins/files/gitg-files-tree-store.vala

-libfiles_la_SOURCES = 							\
-	$(libfiles_la_VALASOURCES)					\
-	gitg-files-resources.c
+plugins_files_libfiles_la_SOURCES = 					\
+	$(plugins_files_libfiles_la_VALASOURCES)			\
+	plugins/files/gitg-files-resources.c

-libfiles_la_plugindir = $(GITG_PLUGIN_LIBDIR)
-libfiles_la_plugin_LTLIBRARIES = libfiles.la
-libfiles_la_plugin_DATA = files.plugin
+plugins_files_libfiles_resources_deps = $(call GRESDEPS,plugins/files/resources/resources.xml)
+plugins/files/gitg-files-resources.c: $(plugins_files_libfiles_resources_deps)
+	$(GRESGEN)

-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 "$@" "$<"
+GITIGNOREFILES +=						\
+	$(plugins_files_libfiles_la_VALASOURCES:%.vala=%.c)	\
+	plugins_files_libfiles_la_vala.stamp

-GITIGNOREFILES =				\
-	$(libfiles_la_VALASOURCES:%.vala=%.c)	\
-	libfiles_la_vala.stamp
+CLEANFILES +=							\
+	plugins/files/gitg-files-resources.c

-CLEANFILES =					\
-	gitg-files-resources.c
-
-EXTRA_DIST =					\
-	$(libfiles_la_plugin_DATA)		\
-	resources/resources.xml			\
-	$(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir)/resources $(srcdir)/resources/resources.xml)
-
-include $(top_srcdir)/git.mk
+EXTRA_DIST +=							\
+	$(plugins_files_libfiles_la_plugin_DATA)		\
+	$(plugins_files_libfiles_resources_deps)

 # vi:ts=8:noet