colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Thomas Haller
2016-10-18 14:01:56 +02:00
parent b0f4e25782
commit 14b5309af3
4 changed files with 44 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
Makefile.am
View File

@@ -1,5 +1,6 @@
include $(GLIB_MAKEFILE) include $(GLIB_MAKEFILE)
-include $(INTROSPECTION_MAKEFILE) -include $(INTROSPECTION_MAKEFILE)
include Makefile.vapigen
@GNOME_CODE_COVERAGE_RULES@ @GNOME_CODE_COVERAGE_RULES@
@@ -40,6 +41,7 @@ check_programs =
check_programs_norun = check_programs_norun =
check_ltlibraries = check_ltlibraries =
check_local = check_local =
VAPIGEN_VAPIS =
dbusservice_DATA = dbusservice_DATA =
dbusactivation_DATA = dbusactivation_DATA =
@@ -59,6 +61,9 @@ pkgconfig_DATA =
pppd_plugindir = $(PPPD_PLUGIN_DIR) pppd_plugindir = $(PPPD_PLUGIN_DIR)
pppd_plugin_LTLIBRARIES = pppd_plugin_LTLIBRARIES =
vapidir = $(datadir)/vala/vapi
vapi_DATA =
examplesdir = $(docdir)/examples examplesdir = $(docdir)/examples
rundir=$(runstatedir)/NetworkManager rundir=$(runstatedir)/NetworkManager
@@ -86,9 +91,6 @@ SUBDIRS += \
docs/libnm-glib docs/libnm-glib
endif endif
SUBDIRS += \
vapi
############################################################################### ###############################################################################
set_sanitizer_env = \ set_sanitizer_env = \
@@ -4131,6 +4133,44 @@ man_MANS += \
endif endif
endif endif
###############################################################################
# vapi
###############################################################################
if ENABLE_VAPIGEN
if WITH_LEGACY_LIBRARIES
VAPIGEN_VAPIS += \
vapi/libnm-util.vapi \
vapi/libnm-glib.vapi
endif
vapi/libnm-util.vapi: $(top_builddir)/libnm-util/NetworkManager-1.0.gir vapi/libnm-util.deps vapi/NetworkManager-1.0.metadata
vapi/libnm-glib.vapi: $(top_builddir)/libnm-glib/NMClient-1.0.gir vapi/libnm-glib.deps vapi/NMClient-1.0.metadata vapi/libnm-util.vapi
vapi_libnm_util_vapi_METADATADIRS = $(srcdir)/vapi
vapi_libnm_util_vapi_FILES = $(top_builddir)/libnm-util/NetworkManager-1.0.gir
vapi_libnm_glib_vapi_METADATADIRS = $(srcdir)/vapi
vapi_libnm_glib_vapi_FILES = $(top_builddir)/libnm-glib/NMClient-1.0.gir
vapi_libnm_glib_vapi_VAPIDIRS = $(builddir)
vapi_libnm_glib_vapi_GIRDIRS = $(top_builddir)/libnm-util
vapi_libnm_glib_vapi_DEPS = gio-2.0
vapi_DATA += \
$(VAPIGEN_VAPIS) \
$(VAPIGEN_VAPIS:.vapi=.deps)
CLEANFILES += $(VAPIGEN_VAPIS)
endif
EXTRA_DIST += \
vapi/NetworkManager-1.0.metadata \
vapi/NMClient-1.0.metadata \
vapi/libnm-util.deps \
vapi/libnm-glib.deps
############################################################################### ###############################################################################
girdir = $(datadir)/gir-1.0 girdir = $(datadir)/gir-1.0

2
vapi/Makefile.vapigen → Makefile.vapigen
View File

@@ -43,8 +43,6 @@ _vapigen_silent_opts = $(_vapigen_silent_opts_$(V))
_vapigen_silent_opts_ = $(_vapigen_silent_opts_$(AM_DEFAULT_VERBOSITY)) _vapigen_silent_opts_ = $(_vapigen_silent_opts_$(AM_DEFAULT_VERBOSITY))
_vapigen_silent_opts_0 = --quiet _vapigen_silent_opts_0 = --quiet
$(if $(VAPIGEN),,$(error You must define VAPIGEN))
_vapi_name = $(subst /,_,$(subst -,_,$(subst .,_,$(1)))) _vapi_name = $(subst /,_,$(subst -,_,$(subst .,_,$(1))))
define vapigen define vapigen

2
configure.ac
View File

@@ -1043,6 +1043,7 @@ dnl Vala bindings
dnl ------------------------- dnl -------------------------
VAPIGEN_CHECK(0.17.1.24) VAPIGEN_CHECK(0.17.1.24)
AC_CONFIG_COMMANDS([vapi], [$MKDIR_P vapi])
# Tests, utilities and documentation # Tests, utilities and documentation
AC_ARG_ENABLE(tests, AS_HELP_STRING([--enable-tests=root|yes|no], [Build NetworkManager tests (default: yes)])) AC_ARG_ENABLE(tests, AS_HELP_STRING([--enable-tests=root|yes|no], [Build NetworkManager tests (default: yes)]))
@@ -1163,7 +1164,6 @@ examples/C/Makefile
examples/C/glib/Makefile examples/C/glib/Makefile
examples/C/qt/Makefile examples/C/qt/Makefile
examples/dispatcher/Makefile examples/dispatcher/Makefile
vapi/Makefile
]) ])
AC_CONFIG_SUBDIRS([libndp]) AC_CONFIG_SUBDIRS([libndp])
AC_OUTPUT AC_OUTPUT

32
vapi/Makefile.am
View File

@@ -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)