brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: don't include deps/glib headers if glib enabled

Browse Source 
If we're using the system glib library then we need to make sure not to
include headers under deps/glib otherwise we end up with with
incompatible typedefs that break the build.

Reviewed-by: Neil Roberts <neil@linux.intel.com>

(cherry picked from commit 5d5fc97b59951ec56a4193b7ee7909ebd3cfbb94)
This commit is contained in:
Robert Bragg 2012-09-24 16:42:44 +01:00
parent 1c0c1a126a
commit ab72a2275f
4 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cogl-gles2/Makefile.am
View File

@ -8,8 +8,11 @@ lib_LTLIBRARIES = libcogl-gles2.la
INCLUDES = \ INCLUDES = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_builddir) \ -I$(top_builddir)
-I$(top_builddir)/deps/glib
if !USE_GLIB
INCLUDES += -I$(top_builddir)/deps/glib
endif
AM_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) $(MAINTAINER_CFLAGS) AM_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) $(MAINTAINER_CFLAGS)

5
cogl/Makefile.am
View File

@ -18,7 +18,6 @@ lib_LTLIBRARIES =
INCLUDES = \ INCLUDES = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_builddir) \ -I$(top_builddir) \
-I$(top_builddir)/deps/glib \
-I$(srcdir)/tesselator \ -I$(srcdir)/tesselator \
-I$(srcdir)/winsys \ -I$(srcdir)/winsys \
-I$(srcdir)/driver/gl \ -I$(srcdir)/driver/gl \
@ -26,6 +25,10 @@ INCLUDES = \
-I$(srcdir)/driver/gl/gles \ -I$(srcdir)/driver/gl/gles \
$(NULL) $(NULL)
if !USE_GLIB
INCLUDES += -I$(top_builddir)/deps/glib
endif
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Cogl\" \ -DG_LOG_DOMAIN=\"Cogl\" \
-DCOGL_COMPILATION \ -DCOGL_COMPILATION \

12
examples/Makefile.am
View File

@ -1,8 +1,11 @@
include $(top_srcdir)/build/autotools/Makefile.am.silent include $(top_srcdir)/build/autotools/Makefile.am.silent
INCLUDES = \ INCLUDES = \
-I$(top_srcdir) \ -I$(top_srcdir)
-I$(top_builddir)/deps/glib
if !USE_GLIB
INCLUDES += -I$(top_builddir)/deps/glib
endif
AM_CFLAGS = \ AM_CFLAGS = \
$(COGL_DEP_CFLAGS) \ $(COGL_DEP_CFLAGS) \
@ -17,9 +20,12 @@ endif
common_ldadd = \ common_ldadd = \
$(COGL_DEP_LIBS) \ $(COGL_DEP_LIBS) \
$(top_builddir)/deps/glib/libglib.la \
$(top_builddir)/cogl/libcogl.la $(top_builddir)/cogl/libcogl.la
if !USE_GLIB
common_ldadd += $(top_builddir)/deps/glib/libglib.la
endif
programs = cogl-info programs = cogl-info
cogl_info_SOURCES = cogl-info.c cogl_info_SOURCES = cogl-info.c

7
tests/conform/Makefile.am
View File

@ -110,8 +110,11 @@ BUILT_SOURCES = wrappers
# testing (such as test-bitmask) will still compile # testing (such as test-bitmask) will still compile
INCLUDES = \ INCLUDES = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_builddir)/cogl \ -I$(top_builddir)/cogl
-I$(top_builddir)/deps/glib
if !USE_GLIB
INCLUDES += -I$(top_builddir)/deps/glib
endif
test_conformance_CPPFLAGS = \ test_conformance_CPPFLAGS = \
-DCOGL_ENABLE_EXPERIMENTAL_API \ -DCOGL_ENABLE_EXPERIMENTAL_API \