[gnome-online-accounts/wip/modules: 1/5] build: Clean up uses of _CFLAGS



commit eced086445d2a21426d605655c07fd789cdbc65e
Author: Debarshi Ray <debarshir gnome org>
Date:   Tue Apr 29 16:46:55 2014 +0200

    build: Clean up uses of _CFLAGS
    
    Move macro definitions to _CPPFLAGS because they are meant for the
    preprocessor and not the compiler.
    
    Fixes: https://bugzilla.gnome.org/729173

 src/goa/Makefile.am        |    2 +-
 src/goabackend/Makefile.am |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/goa/Makefile.am b/src/goa/Makefile.am
index 1ce6407..8093dc5 100644
--- a/src/goa/Makefile.am
+++ b/src/goa/Makefile.am
@@ -11,6 +11,7 @@ AM_CPPFLAGS =                                                         \
        -I$(top_builddir)/src -I$(top_srcdir)/src               \
        -I$(top_builddir)/src/goa                               \
        -DG_LOG_DOMAIN=\"Goa\"                                  \
+       -DGOA_COMPILATION                                       \
        -DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\"               \
        -DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\"               \
        -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\"                  \
@@ -95,7 +96,6 @@ libgoa_1_0_la_SOURCES =                                               \
        $(NULL)
 
 libgoa_1_0_la_CFLAGS =                                         \
-       -DGOA_COMPILATION                                       \
        $(GLIB_CFLAGS)                                          \
        $(NULL)
 
diff --git a/src/goabackend/Makefile.am b/src/goabackend/Makefile.am
index 2e126ac..ab41d6d 100644
--- a/src/goabackend/Makefile.am
+++ b/src/goabackend/Makefile.am
@@ -10,6 +10,8 @@ AM_CPPFLAGS =                                                         \
        -I$(top_srcdir)/src/goaidentity                         \
        -I$(top_builddir)/src/goaidentity                       \
        -DG_LOG_DOMAIN=\"GoaBackend\"                           \
+       -DGOA_BACKEND_COMPILATION                               \
+       -DGOA_API_IS_SUBJECT_TO_CHANGE                          \
        -DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\"               \
        -DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\"               \
        -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\"                  \
@@ -92,8 +94,6 @@ libgoa_backend_1_0_la_SOURCES +=                                      \
 endif
 
 libgoa_backend_1_0_la_CFLAGS =                                 \
-       -DGOA_BACKEND_COMPILATION                               \
-       -DGOA_API_IS_SUBJECT_TO_CHANGE                          \
        $(WEBKIT_GTK_CFLAGS)                                    \
        $(JSON_GLIB_CFLAGS)                                     \
        $(GCR_CFLAGS)                                           \


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