diff options
| author | Sjoerd Simons <sjoerd@luon.net> | 2014-04-26 20:55:17 +0200 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd@luon.net> | 2014-04-26 20:55:17 +0200 |
| commit | 0dccbc804e92f56afd9e7d598dce4bcd8716bbcc (patch) | |
| tree | 1054a65c0cde38dc89e5c692a3a7458160823afa /src/ppp-manager/Makefile.am | |
| parent | 7df62b86e35a67049a4bc7810c29994d8a7ef175 (diff) | |
| parent | 59c3714a494c3b3765657c0551ad82842d98a7d2 (diff) | |
Merge tag 'upstream/0.9.8.10'
Upstream version 0.9.8.10
Diffstat (limited to 'src/ppp-manager/Makefile.am')
| -rw-r--r-- | src/ppp-manager/Makefile.am | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/ppp-manager/Makefile.am b/src/ppp-manager/Makefile.am index 7e8102a5..4ad4ff81 100644 --- a/src/ppp-manager/Makefile.am +++ b/src/ppp-manager/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I${top_srcdir} \ -I${top_builddir}/include \ -I${top_srcdir}/include \ @@ -8,7 +8,9 @@ INCLUDES = \ -I${top_builddir}/src/generated \ -I${top_srcdir}/src/generated \ -I${top_srcdir}/src/logging \ - -I${top_srcdir}/src/posix-signals + -I${top_srcdir}/src/posix-signals \ + $(DBUS_CFLAGS) \ + $(GLIB_CFLAGS) noinst_LTLIBRARIES = libppp-manager.la @@ -25,7 +27,7 @@ built_sources = nm-ppp-manager-glue.h $(libppp_manager_la_OBJECTS): $(built_sources) libppp_manager_la_CPPFLAGS = \ - $(DBUS_CFLAGS) \ + $(AM_CPPFLAGS) \ -DSYSCONFDIR=\"$(sysconfdir)\" \ -DLIBDIR=\"$(libdir)\" \ -DPLUGINDIR=\"$(PPPD_PLUGIN_DIR)\" @@ -47,10 +49,6 @@ nm_pppd_plugin_la_SOURCES = \ nm-pppd-plugin.h \ nm-ppp-status.h -nm_pppd_plugin_la_CPPFLAGS = \ - $(DBUS_CFLAGS) \ - $(GLIB_CFLAGS) - nm_pppd_plugin_la_LDFLAGS = -module -avoid-version nm_pppd_plugin_la_LIBADD = \ |