diff options
| author | Michael Biebl <biebl@debian.org> | 2013-02-03 14:49:22 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2013-02-03 14:49:22 +0100 |
| commit | 9c202e3e860b3be9e1f8882630b69affbb130102 (patch) | |
| tree | 8202bf39f2129486971fa7d5ae0dee61a561aa53 /libnm-util/Makefile.am | |
| parent | 36cb2f364a821e1be50b23e03a18891ec55adb06 (diff) | |
Imported Upstream version 0.9.7.995 upstream/0.9.7.995
Diffstat (limited to 'libnm-util/Makefile.am')
| -rw-r--r-- | libnm-util/Makefile.am | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am index 76acd99f..bd1b3fc0 100644 --- a/libnm-util/Makefile.am +++ b/libnm-util/Makefile.am @@ -1,6 +1,6 @@ include $(GLIB_MAKEFILE) -SUBDIRS=. tests +SUBDIRS = . tests INCLUDES = -I${top_srcdir} -I${top_srcdir}/include -I${top_builddir}/include @@ -9,8 +9,7 @@ lib_LTLIBRARIES=libnm-util.la libnm_util_la_CPPFLAGS = \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ - $(UUID_CFLAGS) \ - -DG_DISABLE_DEPRECATED + $(UUID_CFLAGS) libnm_util_include_HEADERS = \ nm-connection.h \ @@ -19,6 +18,8 @@ libnm_util_include_HEADERS = \ nm-setting-adsl.h \ nm-setting-bluetooth.h \ nm-setting-bond.h \ + nm-setting-bridge.h \ + nm-setting-bridge-port.h \ nm-setting-connection.h \ nm-setting-infiniband.h \ nm-setting-ip4-config.h \ @@ -53,6 +54,8 @@ libnm_util_la_csources = \ nm-setting-adsl.c \ nm-setting-bluetooth.c \ nm-setting-bond.c \ + nm-setting-bridge.c \ + nm-setting-bridge-port.c \ nm-setting-connection.c \ nm-setting-infiniband.c \ nm-setting-ip4-config.c \ @@ -165,7 +168,7 @@ typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) CLEANFILES += $(gir_DATA) $(typelib_DATA) endif -if WITH_TESTS +if ENABLE_TESTS check-local: $(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-util.so $(SYMBOL_VIS_FILE) |