[grilo] build: remove "INCLUDES" from Makefile.am



commit 26ea24d9d31ca4069185d38b07ace35bc5afdb59
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date:   Tue Aug 5 09:04:08 2014 +0000

    build: remove "INCLUDES" from Makefile.am
    
    Deprecated option.

 tools/grilo-inspect/Makefile.am |    3 +--
 tools/grilo-launch/Makefile.am  |    3 +--
 tools/grilo-test-ui/Makefile.am |    5 ++---
 3 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/tools/grilo-inspect/Makefile.am b/tools/grilo-inspect/Makefile.am
index 3ba94c8..17e51ca 100644
--- a/tools/grilo-inspect/Makefile.am
+++ b/tools/grilo-inspect/Makefile.am
@@ -12,8 +12,6 @@ grl-inspect.c: grl-core-keys.h
 grl-core-keys.h: $(top_builddir)/src/grl-metadata-key.h
        $(AWK) 'BEGIN { printf "gchar *grl_core_keys[] = {\n" } { if ( $$2 ~ /^GRL_METADATA_KEY_/ && $$2 !~ 
/_GET_/ ) printf "\""$$2"\",\n" } END { printf "};\n" }' $< > $@
 
-INCLUDES = $(DEPS_CFLAGS)
-
 bin_PROGRAMS =                 \
        grl-inspect- GRL_MAJORMINOR@
 
@@ -22,6 +20,7 @@ grl_inspect_ GRL_MAJORMINOR@_SOURCES =        \
        grl-core-keys.h
 
 grl_inspect_ GRL_MAJORMINOR@_CFLAGS =  \
+       $(DEPS_CFLAGS)                                                  \
        -DPREFIX=$(prefix)                                              \
        -I$(top_srcdir)/src                                             \
        -I$(top_srcdir)/src/data
diff --git a/tools/grilo-launch/Makefile.am b/tools/grilo-launch/Makefile.am
index f9c3304..1792e8a 100644
--- a/tools/grilo-launch/Makefile.am
+++ b/tools/grilo-launch/Makefile.am
@@ -5,8 +5,6 @@
 #
 # Copyright (C) 2014 Igalia S.L.
 
-INCLUDES = $(DEPS_CFLAGS)
-
 bin_PROGRAMS =       \
    grl-launch- GRL_MAJORMINOR@
 
@@ -14,6 +12,7 @@ grl_launch_ GRL_MAJORMINOR@_SOURCES =  \
    grl-launch.c
 
 grl_launch_ GRL_MAJORMINOR@_CFLAGS =   \
+   $(DEPS_CFLAGS)                        \
    -DPREFIX=$(prefix)                  \
    -I$(top_srcdir)/src                 \
    -I$(top_srcdir)/src/data
diff --git a/tools/grilo-test-ui/Makefile.am b/tools/grilo-test-ui/Makefile.am
index 353e3f9..a849af6 100644
--- a/tools/grilo-test-ui/Makefile.am
+++ b/tools/grilo-test-ui/Makefile.am
@@ -5,17 +5,16 @@
 #
 # Copyright (C) 2010 Igalia S.L.
 
-INCLUDES = $(DEPS_CFLAGS)
-
 bin_PROGRAMS = grilo-test-ui- GRL_MAJORMINOR@
 
 grilo_test_ui_ GRL_MAJORMINOR@_SOURCES =       \
        main.c
 
 grilo_test_ui_ GRL_MAJORMINOR@_CFLAGS =        \
-       -DPREFIX=$(prefix)                                                      \
+       $(DEPS_CFLAGS)                                                                  \
        $(GTU_CFLAGS)                                                                   \
        $(GRL_FLICKR_CFLAGS)                                                    \
+       -DPREFIX=$(prefix)                                                      \
        -I$(top_srcdir)/src                                                     \
        -I$(top_srcdir)/src/data
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]