From 33491bc4279481db8ae47213e34a6d695a0e8830 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 6 Jul 2014 02:16:10 +0200 Subject: Imported Upstream version 0.9.10.0 --- src/ppp-manager/Makefile.am | 46 ++++----------------------------------------- 1 file changed, 4 insertions(+), 42 deletions(-) (limited to 'src/ppp-manager/Makefile.am') diff --git a/src/ppp-manager/Makefile.am b/src/ppp-manager/Makefile.am index 4ad4ff81..46fc9138 100644 --- a/src/ppp-manager/Makefile.am +++ b/src/ppp-manager/Makefile.am @@ -1,46 +1,13 @@ +if WITH_PPP + AM_CPPFLAGS = \ - -I${top_srcdir} \ -I${top_builddir}/include \ -I${top_srcdir}/include \ - -I${top_builddir}/libnm-util \ - -I${top_srcdir}/libnm-util \ - -I${top_srcdir}/src \ - -I${top_builddir}/src/generated \ - -I${top_srcdir}/src/generated \ - -I${top_srcdir}/src/logging \ - -I${top_srcdir}/src/posix-signals \ + -DG_LOG_DOMAIN=\""nm-pppd-plugin"\" \ + -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(DBUS_CFLAGS) \ $(GLIB_CFLAGS) -noinst_LTLIBRARIES = libppp-manager.la - -libppp_manager_la_SOURCES = \ - nm-ppp-manager.c \ - nm-ppp-manager.h \ - nm-ppp-status.h - -nm-ppp-manager-glue.h: $(top_srcdir)/introspection/nm-ppp-manager.xml - $(AM_V_GEN) dbus-binding-tool --prefix=nm_ppp_manager --mode=glib-server --output=$@ $< - -built_sources = nm-ppp-manager-glue.h - -$(libppp_manager_la_OBJECTS): $(built_sources) - -libppp_manager_la_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -DSYSCONFDIR=\"$(sysconfdir)\" \ - -DLIBDIR=\"$(libdir)\" \ - -DPLUGINDIR=\"$(PPPD_PLUGIN_DIR)\" - -libppp_manager_la_LIBADD = \ - $(top_builddir)/src/generated/libnm-generated.la \ - $(top_builddir)/src/logging/libnm-logging.la \ - $(top_builddir)/src/posix-signals/libnm-posix-signals.la \ - $(DBUS_LIBS) \ - $(GLIB_LIBS) - -if WITH_PPP - pppd_plugindir = $(PPPD_PLUGIN_DIR) pppd_plugin_LTLIBRARIES = nm-pppd-plugin.la @@ -57,8 +24,3 @@ nm_pppd_plugin_la_LIBADD = \ $(GLIB_LIBS) endif - -BUILT_SOURCES = nm-ppp-manager-glue.h - -CLEANFILES = $(BUILT_SOURCES) - -- cgit 1.3.0-6-gf8a5