GNOME.org
 

[ORBit2] Use AM_CPPFLAGS instead of INCLUDES

commit 23421cec764f70a6d0568e7fa4f30290eef1df08
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Tue May 14 13:30:10 2013 +0200

    Use AM_CPPFLAGS instead of INCLUDES

 configure.in                     |  413 --------------------------------------
 linc2/test/Makefile.am           |    2 +-
 src/idl-compiler/Makefile.am     |    2 +-
 src/orb/GIOP/Makefile.am         |    2 +-
 src/orb/Makefile.am              |    2 +-
 src/orb/dynamic/Makefile.am      |    2 +-
 src/orb/orb-core/Makefile.am     |    2 +-
 src/orb/poa/Makefile.am          |    2 +-
 src/orb/util/Makefile.am         |    2 +-
 src/services/imodule/Makefile.am |    2 +-
 src/services/name/Makefile.am    |    2 +-
 test/Makefile.am                 |    2 +-
 test/inhibit/Makefile.am         |    2 +-
 test/poa/Makefile.am             |    2 +-
 14 files changed, 13 insertions(+), 426 deletions(-)
---
diff --git a/linc2/test/Makefile.am b/linc2/test/Makefile.am
index 1979b9a..c6532fe 100644
--- a/linc2/test/Makefile.am
+++ b/linc2/test/Makefile.am
@@ -2,7 +2,7 @@ noinst_PROGRAMS = test-linc
 
 #      -I$(top_srcdir)/include
 #      -I$(top_builddir)/include
-INCLUDES =                             \
+AM_CPPFLAGS =                          \
        -I$(top_srcdir)/linc2/include   \
        -I$(top_builddir)/linc2/include \
        -I$(top_srcdir)/linc2/src       \
diff --git a/src/idl-compiler/Makefile.am b/src/idl-compiler/Makefile.am
index b45cae2..44b600b 100644
--- a/src/idl-compiler/Makefile.am
+++ b/src/idl-compiler/Makefile.am
@@ -2,7 +2,7 @@ bin_PROGRAMS = orbit-idl-2
 
 orbit_backends_dir = $(libdir)/orbit-2.0/idl-backends
 
-INCLUDES =                                                     \
+AM_CPPFLAGS =                                                  \
        -I$(top_builddir)                                       \
        -I$(top_builddir)/include                               \
        -I$(top_srcdir)                                         \
diff --git a/src/orb/GIOP/Makefile.am b/src/orb/GIOP/Makefile.am
index 189f9f8..08b3be3 100644
--- a/src/orb/GIOP/Makefile.am
+++ b/src/orb/GIOP/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =                             \
+AM_CPPFLAGS =                          \
        -I$(top_srcdir)/include         \
        -I$(top_builddir)/include       \
        -DORBIT2_INTERNAL_API           \
diff --git a/src/orb/Makefile.am b/src/orb/Makefile.am
index 2b443ba..f82227e 100644
--- a/src/orb/Makefile.am
+++ b/src/orb/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS=include orb-core util GIOP poa dynamic
 
 lib_LTLIBRARIES=libORBit-2.la
 
-INCLUDES =                                     \
+AM_CPPFLAGS =                                  \
        -I.                                     \
        -I$(srcdir)                             \
        -I$(top_srcdir)/include                 \
diff --git a/src/orb/dynamic/Makefile.am b/src/orb/dynamic/Makefile.am
index 330bf53..11e5785 100644
--- a/src/orb/dynamic/Makefile.am
+++ b/src/orb/dynamic/Makefile.am
@@ -5,7 +5,7 @@ liborb_dynamic_la_SOURCES= \
        $(DYNAMIC_IDLOUT) \
        dynany.c
 
-INCLUDES =                                             \
+AM_CPPFLAGS =                                          \
        -I$(top_srcdir)/include                         \
        -I$(top_srcdir)/src/orb                         \
        -I$(top_builddir)/include                       \
diff --git a/src/orb/orb-core/Makefile.am b/src/orb/orb-core/Makefile.am
index 7cbed96..43b54ac 100644
--- a/src/orb/orb-core/Makefile.am
+++ b/src/orb/orb-core/Makefile.am
@@ -2,7 +2,7 @@ noinst_LTLIBRARIES=liborb-core.la
 
 TYPELIB_DIR=$(libdir)/orbit-2.0
 
-INCLUDES =                                             \
+AM_CPPFLAGS =                                          \
        -I.                                             \
        -I$(srcdir)                                     \
        -I$(top_builddir)/include                       \
diff --git a/src/orb/poa/Makefile.am b/src/orb/poa/Makefile.am
index c42ae31..f47069c 100644
--- a/src/orb/poa/Makefile.am
+++ b/src/orb/poa/Makefile.am
@@ -2,7 +2,7 @@ noinst_LTLIBRARIES=liborb-poa.la
 
 IDL = $(top_builddir)/src/idl-compiler/orbit-idl-2
 
-INCLUDES =                                             \
+AM_CPPFLAGS =                                          \
        -I$(top_srcdir)/include                         \
        -I$(top_builddir)/include                       \
        -I$(top_builddir)/src/orb/orb-core              \
diff --git a/src/orb/util/Makefile.am b/src/orb/util/Makefile.am
index b391cd7..412be1f 100644
--- a/src/orb/util/Makefile.am
+++ b/src/orb/util/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES=liborb-util.la
 
-INCLUDES =                                             \
+AM_CPPFLAGS =                                          \
        -I$(top_srcdir)/include                         \
        -I$(top_builddir)/include                       \
        -DORBIT_SYSTEM_RCFILE=\"$(sysconfdir)/orbitrc\" \
diff --git a/src/services/imodule/Makefile.am b/src/services/imodule/Makefile.am
index e0731a4..f63c920 100644
--- a/src/services/imodule/Makefile.am
+++ b/src/services/imodule/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 lib_LTLIBRARIES = libORBit-imodule-2.la
 
-INCLUDES =                             \
+AM_CPPFLAGS =                          \
         -I$(top_srcdir)/include                \
         -I$(top_builddir)/include      \
        -DORBIT2_INTERNAL_API           \
diff --git a/src/services/name/Makefile.am b/src/services/name/Makefile.am
index 7212557..deda1ed 100644
--- a/src/services/name/Makefile.am
+++ b/src/services/name/Makefile.am
@@ -26,7 +26,7 @@ libORBitCosNaming_2_la_LDFLAGS =                                      \
        $(ORBIT_NAME_LIBS)                                              \
        $(top_builddir)/src/orb/libORBit-2.la
 
-INCLUDES =                             \
+AM_CPPFLAGS =                          \
        -I.                             \
        -I$(top_builddir)/include       \
        -I$(top_srcdir)/include         \
diff --git a/test/Makefile.am b/test/Makefile.am
index a48d38e..87f35af 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = everything inhibit poa
 
-INCLUDES =                          \
+AM_CPPFLAGS =                       \
        -I$(top_srcdir)/include     \
        -I$(top_srcdir)/src/orb     \
        -I$(top_builddir)/include   \
diff --git a/test/inhibit/Makefile.am b/test/inhibit/Makefile.am
index 3974d0d..ef26a21 100644
--- a/test/inhibit/Makefile.am
+++ b/test/inhibit/Makefile.am
@@ -1,7 +1,7 @@
 noinst_PROGRAMS=                                       \
        test-inhibit
 
-INCLUDES =                           \
+AM_CPPFLAGS =                           \
        -I$(top_srcdir)/include      \
        -I$(top_builddir)/include    \
        $(WARN_CFLAGS)               \
diff --git a/test/poa/Makefile.am b/test/poa/Makefile.am
index becfcfa..6cf9c38 100644
--- a/test/poa/Makefile.am
+++ b/test/poa/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =                         \
+AM_CPPFLAGS =                         \
        -I$(top_srcdir)/include    \
        -I$(top_builddir)/include  \
        $(WARN_CFLAGS)             \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]