Merge tag 'upstream/0.23.5'

Upstream version 0.23.5

2 files changed, 0 insertions, 64 deletions

diff --git a/src/plugins/mk/interfaces.mk b/src/plugins/mk/interfaces.mk
deleted file mode 100644
index 34be1eb..0000000
--- a/src/plugins/mk/interfaces.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-PLUGIN_INTERFACES := \
-	src/plugins/SpitInterfaces.vala \
-	src/plugins/TransitionsInterfaces.vala \
-	src/plugins/PublishingInterfaces.vala \
-	src/plugins/DataImportsInterfaces.vala
-
-PLUGIN_PKG_REQS := \
-	gobject-2.0 \
-	glib-2.0 \
-	gdk-3.0 \
-	gtk+-3.0 \
-	gee-0.8
-
-PLUGIN_VAPI := plugins/shotwell-plugin-dev-1.0.vapi
-PLUGIN_HEADER := $(PLUGIN_VAPI:.vapi=.h)
-PLUGIN_DEPS := $(PLUGIN_VAPI:.vapi=.deps)
-
-$(PLUGIN_DEPS): src/plugins/mk/interfaces.mk
-	rm -f $@
-	$(foreach pkg,$(PLUGIN_PKG_REQS),`echo $(pkg) >> $@`)
-
-$(PLUGIN_HEADER): $(PLUGIN_VAPI)
-
-$(PLUGIN_VAPI): $(PLUGIN_INTERFACES) src/plugins/mk/interfaces.mk
-	$(call check_valac_version)
-	$(VALAC) -c $(VALAFLAGS) -X -DGETTEXT_PACKAGE='"shotwell"' -X -I. $(foreach pkg,$(PLUGIN_PKG_REQS),--pkg=$(pkg)) --includedir=plugins --vapi=$@ --header=$(basename $@).h $(PLUGIN_INTERFACES)
-	$(foreach src,$(PLUGIN_INTERFACES),`rm $(notdir $(src)).o`)
-
diff --git a/src/plugins/mk/plugins.mk b/src/plugins/mk/plugins.mk
deleted file mode 100644
index 903dd8e..0000000
--- a/src/plugins/mk/plugins.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-
-# UNIT_NAME is the Vala namespace.  A file named UNIT_NAME.vala must be in this directory with
-# a init() and terminate() function declared in the namespace.
-UNIT_NAME := Plugins
-
-# UNIT_DIR should match the subdirectory the files are located in.  Generally UNIT_NAME in all
-# lowercase.  The name of this file should be UNIT_DIR.mk.
-UNIT_DIR := plugins
-
-# All Vala files in the unit should be listed here with no subdirectory prefix.
-#
-# NOTE: Do *not* include the unit's master file, i.e. UNIT_NAME.vala.
-UNIT_FILES := \
-	PublishingInterfaces.vala \
-	SpitInterfaces.vala \
-	TransitionsInterfaces.vala \
-	StandardHostInterface.vala \
-	ManifestWidget.vala \
-	DataImportsInterfaces.vala
-
-# Any unit this unit relies upon (and should be initialized before it's initialized) should
-# be listed here using its Vala namespace.
-#
-# NOTE: All units are assumed to rely upon the unit-unit.  Do not include that here.
-UNIT_USES := \
-	Util
-
-# List any additional files that are used in the build process as a part of this unit that should
-# be packaged in the tarball.  File names should be relative to the unit's home directory.
-UNIT_RC := \
-	mk/interfaces.mk
-
-# unitize.mk must be called at the end of each UNIT_DIR.mk file.
-include unitize.mk
-