diff options
| author | Sjoerd Simons <sjoerd@luon.net> | 2014-04-26 20:55:09 +0200 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd@luon.net> | 2014-04-26 20:55:09 +0200 |
| commit | 59c3714a494c3b3765657c0551ad82842d98a7d2 (patch) | |
| tree | e4dcdf9791fc40581f02bfaf870c30b102b3133a /libnm-util/tests/Makefile.am | |
| parent | a4256940da049f91bbbea5e53e469a59ea9c10f7 (diff) | |
Imported Upstream version 0.9.8.10 upstream/0.9.8.10
Diffstat (limited to 'libnm-util/tests/Makefile.am')
| -rw-r--r-- | libnm-util/tests/Makefile.am | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/libnm-util/tests/Makefile.am b/libnm-util/tests/Makefile.am index 98f8aad8..d49ef8c8 100644 --- a/libnm-util/tests/Makefile.am +++ b/libnm-util/tests/Makefile.am @@ -2,11 +2,13 @@ if ENABLE_TESTS SUBDIRS=certs -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/include \ -I$(top_builddir)/include \ -I$(top_srcdir)/libnm-util \ - -I$(top_builddir)/libnm-util + -I$(top_builddir)/libnm-util \ + $(GLIB_CFLAGS) \ + $(DBUS_CFLAGS) noinst_PROGRAMS = \ test-settings-defaults \ @@ -18,10 +20,6 @@ noinst_PROGRAMS = \ test_settings_defaults_SOURCES = \ test-settings-defaults.c -test_settings_defaults_CPPFLAGS = \ - $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) - test_settings_defaults_LDADD = \ $(top_builddir)/libnm-util/libnm-util.la \ $(GLIB_LIBS) \ @@ -30,9 +28,6 @@ test_settings_defaults_LDADD = \ test_crypto_SOURCES = \ test-crypto.c -test_crypto_CPPFLAGS = \ - $(GLIB_CFLAGS) - test_crypto_LDADD = \ $(top_builddir)/libnm-util/libtest-crypto.la \ $(top_builddir)/libnm-util/libnm-util.la \ @@ -43,8 +38,7 @@ test_secrets_SOURCES = \ test_secrets_CPPFLAGS = \ -DTEST_CERT_DIR=\"$(top_srcdir)/libnm-util/tests/certs/\" \ - $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) + $(AM_CPPFLAGS) test_secrets_LDADD = \ $(top_builddir)/libnm-util/libnm-util.la \ @@ -54,10 +48,6 @@ test_secrets_LDADD = \ test_general_SOURCES = \ test-general.c -test_general_CPPFLAGS = \ - $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) - test_general_LDADD = \ $(top_builddir)/libnm-util/libnm-util.la \ $(GLIB_LIBS) \ @@ -66,10 +56,6 @@ test_general_LDADD = \ test_setting_8021x_SOURCES = \ test-setting-8021x.c -test_setting_8021x_CPPFLAGS = \ - $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) - test_setting_8021x_LDADD = \ $(top_builddir)/libnm-util/libnm-util.la \ $(GLIB_LIBS) \ |