diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-09-25 18:18:49 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-09-25 18:23:15 +0200 |
| commit | 01677a3e40de8ee7db83043c3409e54f38b5d66b (patch) | |
| tree | 949f72f2cbe57fa9246e655ee8e16476767093a9 | |
| parent | 9344013977bee9d17413a4ab18ad13a4b2244ac3 (diff) | |
| download | NetworkManager-01677a3e40de8ee7db83043c3409e54f38b5d66b.tar.gz | |
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.
| -rw-r--r-- | Makefile.am | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 0bc3959d7b..7bce597e99 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1734,12 +1734,12 @@ EXTRA_src_ppp_libnm_ppp_plugin_la_DEPENDENCIES = \ src/ppp/nm-ppp-plugin.ver src_ppp_libnm_ppp_plugin_la_CPPFLAGS = \ - -I${top_srcdir}/src \ - -I${top_builddir}/src \ - -I${top_srcdir}/shared \ - -I$(top_builddir)/shared \ - -I${top_builddir}/libnm-core \ - -I${top_srcdir}/libnm-core \ + -I$(srcdir)/src \ + -I$(builddir)/src \ + -I$(srcdir)/shared \ + -I$(builddir)/shared \ + -I$(builddir)/libnm-core \ + -I$(srcdir)/libnm-core \ -DPPPD_PLUGIN_DIR=\"$(PPPD_PLUGIN_DIR)\" \ -DG_LOG_DOMAIN=\""NetworkManager"\" \ -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 = \ -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 = \ introspection/libnmdbus.la \ |