diff options
| author | Pavel Šimerda <psimerda@redhat.com> | 2014-11-25 13:17:27 +0100 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2014-11-26 13:34:21 -0600 |
| commit | 1bb881d486ebb5500961345a104d7a400074b8e2 (patch) | |
| tree | 4152f6b1241079e23de5f551d6f45e2cb57efd70 | |
| parent | 5cec2868cce0a830dcb31d8c8cd1d05f56853f0a (diff) | |
| download | network-manager-applet-1bb881d486ebb5500961345a104d7a400074b8e2.tar.gz | |
build: get rid of obsolete INCLUDES in Makefile.am (bgo #740680)
https://bugzilla.gnome.org/show_bug.cgi?id=740680
| -rw-r--r-- | src/gconf-helpers/tests/Makefile.am | 3 | ||||
| -rw-r--r-- | src/gnome-bluetooth/Makefile.am | 4 | ||||
| -rw-r--r-- | src/utils/tests/Makefile.am | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/gconf-helpers/tests/Makefile.am b/src/gconf-helpers/tests/Makefile.am index f8e3d649..4b485b91 100644 --- a/src/gconf-helpers/tests/Makefile.am +++ b/src/gconf-helpers/tests/Makefile.am @@ -1,5 +1,3 @@ -INCLUDES = -I$(top_srcdir)/src/utils - noinst_PROGRAMS = test-upgrade test_upgrade_SOURCES = \ @@ -10,6 +8,7 @@ test_upgrade_SOURCES = \ fake-gconf.c test_upgrade_CPPFLAGS = \ + -I $(top_srcdir)/src/utils \ -I ${srcdir}/../ \ -DTESTDIR=\"$(srcdir)\" \ $(GTK_CFLAGS) \ diff --git a/src/gnome-bluetooth/Makefile.am b/src/gnome-bluetooth/Makefile.am index dbf5373a..35d67ef5 100644 --- a/src/gnome-bluetooth/Makefile.am +++ b/src/gnome-bluetooth/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -DDATADIR=\"$(datadir)\" \ -DICONDIR=\"$(icondir)\" \ -DLOCALEDIR="\"$(datadir)/locale\"" \ @@ -23,7 +23,7 @@ plugin_LTLIBRARIES = libnma.la libnma_la_SOURCES = $(BT_WIDGET_SOURCES) if WITH_MODEM_MANAGER_1 -libnma_la_CPPFLAGS = $(MM_GLIB_CFLAGS) +libnma_la_CPPFLAGS = $(AM_CPPFLAGS) $(MM_GLIB_CFLAGS) endif libnma_la_LDFLAGS = -module -avoid-version diff --git a/src/utils/tests/Makefile.am b/src/utils/tests/Makefile.am index 6534f709..ba676ce4 100644 --- a/src/utils/tests/Makefile.am +++ b/src/utils/tests/Makefile.am @@ -1,10 +1,9 @@ -INCLUDES = -I$(top_srcdir)/src/utils - noinst_PROGRAMS = test-utils test_utils_SOURCES = test-utils.c test_utils_CPPFLAGS = \ + -I $(top_srcdir)/src/utils \ $(GTK_CFLAGS) \ $(NMA_CFLAGS) |