about summary refs log tree commit diff
path: root/libnm/Makefile.am
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2016-04-06 00:47:13 +0200
committerMichael Biebl <biebl@debian.org>2016-04-06 00:47:13 +0200
commit45bb35bff2a8d258aff2c1d9b68cce1787c7da62 (patch)
treee9da08b1d189befb839889185b4f3304d389a60f /libnm/Makefile.am
parentd101696d539cd03172badbcde19e9a13e5707ee1 (diff)
parent2bfb3eb7d0323e69affca154395f51d8b577414d (diff)
Merge tag 'upstream/1.1.93'
Upstream version 1.1.93
Diffstat (limited to 'libnm/Makefile.am')
-rw-r--r--libnm/Makefile.am11
1 files changed, 8 insertions, 3 deletions
diff --git a/libnm/Makefile.am b/libnm/Makefile.am
index 80cdccb0..e035b3cd 100644
--- a/libnm/Makefile.am
+++ b/libnm/Makefile.am
@@ -1,5 +1,7 @@
 include $(GLIB_MAKEFILE)
 
+@GNOME_CODE_COVERAGE_RULES@
+
 SUBDIRS = . tests
 
 AM_CPPFLAGS = \
@@ -12,10 +14,10 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/libnm \
 	-DG_LOG_DOMAIN=\""libnm"\" \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
-	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
 	$(GLIB_CFLAGS) \
 	$(GUDEV_CFLAGS) \
-	-DNMRUNDIR=\"$(nmrundir)\"
+	-DNMRUNDIR=\"$(nmrundir)\" \
+	$(CODE_COVERAGE_CFLAGS)
 
 include $(top_srcdir)/libnm-core/Makefile.libnm-core
 
@@ -130,7 +132,7 @@ libnm_la_SOURCES =			\
 GLIB_GENERATED = nm-enum-types.h nm-enum-types.c
 nm_enum_types_sources = $(libnminclude_HEADERS)
 GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM --fhead '\#include <nm-core-enum-types.h>\n'
-GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM
+GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n'
 
 libnm_la_LIBADD = \
 	$(top_builddir)/libnm-core/libnm-core.la \
@@ -139,6 +141,9 @@ libnm_la_LIBADD = \
 	$(UUID_LIBS) \
 	$(GUDEV_LIBS)
 
+libnm_la_LDFLAGS = \
+	$(CODE_COVERAGE_LDFLAGS)
+
 SYMBOL_VIS_FILE=$(srcdir)/libnm.ver
 
 libnm_la_LDFLAGS = -Wl,--version-script=$(SYMBOL_VIS_FILE) \