From 33491bc4279481db8ae47213e34a6d695a0e8830 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Sun, 6 Jul 2014 02:16:10 +0200
Subject: Imported Upstream version 0.9.10.0

---
 Makefile.am | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index 89a338b0..b41bfa90 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,7 @@
 include $(GLIB_MAKEFILE)
 
 SUBDIRS = \
+	. \
 	include \
 	libnm-util \
 	libnm-glib \
@@ -8,16 +9,19 @@ SUBDIRS = \
 	src \
 	callouts \
 	cli \
+	tui \
 	tools \
 	policy \
 	data \
 	test \
 	po \
-	man \
 	docs \
+	man \
 	examples \
 	vapi
 
+@GNOME_CODE_COVERAGE_RULES@
+
 EXTRA_DIST = \
 	CONTRIBUTING \
 	NetworkManager.pc.in \
@@ -25,10 +29,12 @@ EXTRA_DIST = \
 	intltool-merge.in \
 	intltool-update.in \
 	Makefile.glib \
-	autogen.sh
+	autogen.sh \
+	valgrind.suppressions
 
 DISTCHECK_CONFIGURE_FLAGS = \
-	--with-tests=yes \
+	--enable-tests=yes \
+	--with-valgrind=no \
 	--enable-gtk-doc \
 	--enable-more-warnings=yes \
 	--with-udev-dir=$$dc_install_base/lib/udev \
@@ -47,6 +53,13 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 CLEANFILES = cscope.in.out cscope.out cscope.po.out
 
-.PHONY: cscope
 cscope:
 	cscope -b -q -R -Iinclude -ssrc -slibnm-glib -slibnm-util -scli/src;
+
+libgsystem_srcpath := libgsystem
+libgsystem_cflags := $(filter-out -DGLIB_VERSION%,$(GLIB_CFLAGS)) -I$(srcdir)/libgsystem
+libgsystem_libs = $(GLIB_LIBS)
+include libgsystem/Makefile-libgsystem.am
+noinst_LTLIBRARIES = libgsystem.la
+
+.PHONY: cscope
-- 
cgit 1.3.0-6-gf8a5