diff options
| author | Dan Winship <danw@gnome.org> | 2013-08-22 10:47:21 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2013-08-22 11:49:16 -0400 |
| commit | bfce3f7dc8859eef5ba46f3eec463bd591ee8686 (patch) | |
| tree | 8f16f9b781ce447a2f2f22728154b3ed5979dfee /libnm-util/Makefile.am | |
| parent | 1a3c2ed1cb6d96bb71b2f12711281c9153f4223b (diff) | |
| download | NetworkManager-bfce3f7dc8859eef5ba46f3eec463bd591ee8686.tar.gz | |
build: switch from $(INCLUDES) to $(AM_CPPFLAGS) to make automake happy
Unfortunately, $(AM_CPPFLAGS) gets overridden by per-target _CPPFLAGS
variables, which $(INCLUDES) did not, so this requires some additional
changes.
In most places, I have just gotten rid of the per-target _CPPFLAGS
variables; in directories with a single target, the per-target
variable is unnecessary, and in directories with multiple targets, the
per-target variable is often undesirable, since it forces some files
to be compiled twice, even though there ends up being no difference
between the two files.
Diffstat (limited to 'libnm-util/Makefile.am')
| -rw-r--r-- | libnm-util/Makefile.am | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am index 554b4a4b1b..24ddacbeb5 100644 --- a/libnm-util/Makefile.am +++ b/libnm-util/Makefile.am @@ -2,15 +2,24 @@ include $(GLIB_MAKEFILE) SUBDIRS = . tests -INCLUDES = -I${top_srcdir} -I${top_srcdir}/include -I${top_builddir}/include - -lib_LTLIBRARIES=libnm-util.la - -libnm_util_la_CPPFLAGS = \ +AM_CPPFLAGS = \ + -I${top_srcdir} \ + -I${top_srcdir}/include \ + -I${top_builddir}/include \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ $(UUID_CFLAGS) +if WITH_GNUTLS +AM_CPPFLAGS += $(LIBGCRYPT_CFLAGS) $(GNUTLS_CFLAGS) +endif + +if WITH_NSS +AM_CPPFLAGS += $(NSS_CFLAGS) +endif + +lib_LTLIBRARIES=libnm-util.la + libnm_util_include_HEADERS = \ nm-connection.h \ nm-setting.h \ @@ -101,13 +110,11 @@ libnm_util_la_LDFLAGS = -Wl,--version-script=$(SYMBOL_VIS_FILE) \ if WITH_GNUTLS libnm_util_la_SOURCES += crypto_gnutls.c -libnm_util_la_CPPFLAGS += $(LIBGCRYPT_CFLAGS) $(GNUTLS_CFLAGS) libnm_util_la_LIBADD += $(LIBGCRYPT_LIBS) $(GNUTLS_LIBS) endif if WITH_NSS libnm_util_la_SOURCES += crypto_nss.c -libnm_util_la_CPPFLAGS += $(NSS_CFLAGS) libnm_util_la_LIBADD += $(NSS_LIBS) endif @@ -122,21 +129,16 @@ noinst_LTLIBRARIES = libtest-crypto.la libtest_crypto_la_SOURCES = crypto.c -libtest_crypto_la_CPPFLAGS = \ - $(GLIB_CFLAGS) - libtest_crypto_la_LIBADD = \ $(GLIB_LIBS) if WITH_GNUTLS libtest_crypto_la_SOURCES += crypto_gnutls.c -libtest_crypto_la_CPPFLAGS += $(LIBGCRYPT_CFLAGS) $(GNUTLS_CFLAGS) libtest_crypto_la_LIBADD += $(LIBGCRYPT_LIBS) $(GNUTLS_LIBS) endif if WITH_NSS libtest_crypto_la_SOURCES += crypto_nss.c -libtest_crypto_la_CPPFLAGS += $(NSS_CFLAGS) libtest_crypto_la_LIBADD += $(NSS_LIBS) endif @@ -160,7 +162,7 @@ NetworkManager-1.0.gir: libnm-util.la NetworkManager_1_0_gir_INCLUDES = GObject-2.0 DBusGLib-1.0 NetworkManager_1_0_gir_PACKAGES = gobject-2.0 dbus-glib-1 NetworkManager_1_0_gir_EXPORT_PACKAGES = libnm-util -NetworkManager_1_0_gir_CFLAGS = $(INCLUDES) -I$(top_srcdir)/libnm-util +NetworkManager_1_0_gir_CFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/libnm-util NetworkManager_1_0_gir_LIBS = libnm-util.la NetworkManager_1_0_gir_FILES = $(introspection_sources) NetworkManager_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NM --symbol-prefix=nm |