build: merge "vapi/Makefile.am" into toplevel Makefile

There is an strange automake warning

    Makefile.vapigen:49: warning: $(1) was already defined in condition TRUE, which includes condition ENABLE_VAPIGEN ...
    Makefile.am:4:   'Makefile.vapigen' included from here
    Makefile.glib:124: ... '$(1)' previously defined here
    Makefile.am:1:   'Makefile.glib' included from here

when having

    if ENABLE_VAPIGEN
    include Makefile.vapigen
    endif

That is worked around by removing the "if", which however
requires us to remove the error check in Makefile.vapigen.

2 files changed, 0 insertions, 95 deletions

diff --git a/vapi/Makefile.am b/vapi/Makefile.am
deleted file mode 100644
index 4913d1a580..0000000000
--- a/vapi/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-EXTRA_DIST = \
-	NetworkManager-1.0.metadata \
-	NMClient-1.0.metadata \
-	libnm-util.deps \
-	libnm-glib.deps
-
-if WITH_LEGACY_LIBRARIES
-VAPIGEN_VAPIS = libnm-util.vapi libnm-glib.vapi
-endif
-
-if ENABLE_VAPIGEN
-include Makefile.vapigen
-
-libnm-util.vapi: $(top_builddir)/libnm-util/NetworkManager-1.0.gir  libnm-util.deps NetworkManager-1.0.metadata
-libnm-glib.vapi: $(top_builddir)/libnm-glib/NMClient-1.0.gir  libnm-glib.deps NMClient-1.0.metadata libnm-util.vapi
-
-
-libnm_util_vapi_METADATADIRS = $(srcdir)
-libnm_util_vapi_FILES = $(top_builddir)/libnm-util/NetworkManager-1.0.gir
-
-libnm_glib_vapi_METADATADIRS = $(srcdir)
-libnm_glib_vapi_FILES = $(top_builddir)/libnm-glib/NMClient-1.0.gir
-libnm_glib_vapi_VAPIDIRS = $(builddir)
-libnm_glib_vapi_GIRDIRS = $(top_builddir)/libnm-util
-libnm_glib_vapi_DEPS = gio-2.0
-
-vapidir = $(datadir)/vala/vapi
-vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps)
-
-endif
-
-CLEANFILES = $(VAPIGEN_VAPIS)
diff --git a/vapi/Makefile.vapigen b/vapi/Makefile.vapigen
deleted file mode 100644
index 5163af13d3..0000000000
--- a/vapi/Makefile.vapigen
+++ /dev/null
@@ -1,63 +0,0 @@
-# Makefile for Vala API Generator (vapigen)
-# Written by Evan Nemerson
-#
-# The author disclaims copyright to this source code.  In place of
-# a legal notice, here is a blessing:
-#
-#    May you do good and not evil.
-#    May you find forgiveness for yourself and forgive others.
-#    May you share freely, never taking more than you give.
-#
-# See http://live.gnome.org/Vala/UpstreamGuide for detailed documentation
-#
-# Variables:
-#
-#   VAPIGEN_FILES
-#
-#     VAPIs to create
-#
-#   *_DEPS / VAPIGEN_DEPS
-#
-#       The dependencies. Generally the pkg-config names.
-#
-#   *_METADATADIRS / VAPIGEN_METADATADIRS
-#
-#       Directory containing the metadata.
-#
-#   *_VAPIDIRS / VAPIGEN_VAPIDIRS
-#
-#       Additional location(s) to search for VAPI dependencies.
-#
-#   *_GIRDIRS / VAPIGEN_GIRDIRS
-#
-#       Additional location(s) to search for GIR dependencies.
-#
-#   *_FILES
-#
-#       The files which should be used to generate the VAPI.
-
-_vapigen_silent_prefix = $(_vapigen_silent_prefix_$(V))
-_vapigen_silent_prefix_ = $(_vapigen_silent_prefix_$(AM_DEFAULT_VERBOSITY))
-_vapigen_silent_prefix_0 = @echo " VAPIGEN $(1)";
-_vapigen_silent_opts = $(_vapigen_silent_opts_$(V))
-_vapigen_silent_opts_ = $(_vapigen_silent_opts_$(AM_DEFAULT_VERBOSITY))
-_vapigen_silent_opts_0 = --quiet
-
-$(if $(VAPIGEN),,$(error You must define VAPIGEN))
-
-_vapi_name = $(subst /,_,$(subst -,_,$(subst .,_,$(1))))
-
-define vapigen
-$(1): $$($(_vapi_name)_GIR)
-	$(_vapigen_silent_prefix) \
-	G_DEBUG='' \
-	$(VAPIGEN) $(_vapigen_silent_opts) \
-	  --library $(1:.vapi=) \
-	  $(foreach _vapi_metadatadir_name,$(if $($(_vapi_name)_METADATADIRS),$($(_vapi_name)_METADATADIRS),$(VAPIGEN_METADATADIRS)),--metadatadir $(_vapi_metadatadir_name)) \
-	  $(foreach _vapi_dir_name,$(if $($(_vapi_name)_VAPIDIRS),$($(_vapi_name)_VAPIDIRS),$(VAPIGEN_VAPIDIRS)),--vapidir $(_vapi_dir_name)) \
-	  $(foreach _vapi_gir_dir,$(if $($(_vapi_name)_GIRDIRS),$($(_vapi_name)_GIRDIRS),$(VAPIGEN_GIRDIRS)),--girdir $(_vapi_gir_dir)) \
-	  $(foreach _vapi_dep_name,$(if $($(_vapi_name)_DEPS),$($(_vapi_name)_DEPS),$(VAPIGEN_DEPS)),--pkg $(_vapi_dep_name)) \
-	  $$($(_vapi_name)_FILES)
-endef
-
-$(foreach vapi,$(VAPIGEN_VAPIS),$(eval $(call vapigen,$(vapi))))