mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-15 12:34:55 +00:00
build: cleanup style for toplevel Makefile.am
Use consistently $() instead of ${}. Don't use the $(top_*) variables, because we don't do recursive make and the toplevel directory is the same as the current directory. For consistency, only use the non-toplevel versions of the variables.
This commit is contained in:
parent
9344013977
commit
01677a3e40
14
Makefile.am
14
Makefile.am
|
@ -1734,12 +1734,12 @@ EXTRA_src_ppp_libnm_ppp_plugin_la_DEPENDENCIES = \
|
||||||
src/ppp/nm-ppp-plugin.ver
|
src/ppp/nm-ppp-plugin.ver
|
||||||
|
|
||||||
src_ppp_libnm_ppp_plugin_la_CPPFLAGS = \
|
src_ppp_libnm_ppp_plugin_la_CPPFLAGS = \
|
||||||
-I${top_srcdir}/src \
|
-I$(srcdir)/src \
|
||||||
-I${top_builddir}/src \
|
-I$(builddir)/src \
|
||||||
-I${top_srcdir}/shared \
|
-I$(srcdir)/shared \
|
||||||
-I$(top_builddir)/shared \
|
-I$(builddir)/shared \
|
||||||
-I${top_builddir}/libnm-core \
|
-I$(builddir)/libnm-core \
|
||||||
-I${top_srcdir}/libnm-core \
|
-I$(srcdir)/libnm-core \
|
||||||
-DPPPD_PLUGIN_DIR=\"$(PPPD_PLUGIN_DIR)\" \
|
-DPPPD_PLUGIN_DIR=\"$(PPPD_PLUGIN_DIR)\" \
|
||||||
-DG_LOG_DOMAIN=\""NetworkManager"\" \
|
-DG_LOG_DOMAIN=\""NetworkManager"\" \
|
||||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
|
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
|
||||||
|
@ -1747,7 +1747,7 @@ src_ppp_libnm_ppp_plugin_la_CPPFLAGS = \
|
||||||
|
|
||||||
src_ppp_libnm_ppp_plugin_la_LDFLAGS = \
|
src_ppp_libnm_ppp_plugin_la_LDFLAGS = \
|
||||||
-module -avoid-version \
|
-module -avoid-version \
|
||||||
-Wl,--version-script="$(top_srcdir)/src/ppp/nm-ppp-plugin.ver"
|
-Wl,--version-script="$(srcdir)/src/ppp/nm-ppp-plugin.ver"
|
||||||
|
|
||||||
src_ppp_libnm_ppp_plugin_la_LIBADD = \
|
src_ppp_libnm_ppp_plugin_la_LIBADD = \
|
||||||
introspection/libnmdbus.la \
|
introspection/libnmdbus.la \
|
||||||
|
|
Loading…
Reference in a new issue