mirror of
https://github.com/brl/mutter.git
synced 2024-11-29 19:40:43 -05:00
[build] GCC_FLAGS is no more, MAINTAINER_CFLAGS is the One.
CC_FLAGS was a left over from the 0.8.x age. Killed it and use the newer MAINTAINER_CFLAGS variable instead.
This commit is contained in:
parent
4ee49eded0
commit
94b35a4a5e
@ -37,7 +37,7 @@ INCLUDES = \
|
|||||||
$(CLUTTER_CFLAGS) \
|
$(CLUTTER_CFLAGS) \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
AM_CFLAGS = $(GCC_FLAGS) $(CLUTTER_DEBUG_CFLAGS) $(MAINTAINER_CFLAGS)
|
AM_CFLAGS = $(CLUTTER_DEBUG_CFLAGS) $(MAINTAINER_CFLAGS)
|
||||||
|
|
||||||
LDADD = \
|
LDADD = \
|
||||||
$(CLUTTER_LT_LDFLAGS) \
|
$(CLUTTER_LT_LDFLAGS) \
|
||||||
|
@ -9,7 +9,7 @@ INCLUDES = \
|
|||||||
-I$(top_builddir)/clutter \
|
-I$(top_builddir)/clutter \
|
||||||
$(CLUTTER_CFLAGS) \
|
$(CLUTTER_CFLAGS) \
|
||||||
$(CLUTTER_DEBUG_CFLAGS) \
|
$(CLUTTER_DEBUG_CFLAGS) \
|
||||||
$(GCC_FLAGS)
|
$(MAINTAINER_CFLAGS)
|
||||||
|
|
||||||
LDADD = $(CLUTTER_LIBS)
|
LDADD = $(CLUTTER_LIBS)
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@ INCLUDES = \
|
|||||||
-I$(top_builddir)/clutter \
|
-I$(top_builddir)/clutter \
|
||||||
$(CLUTTER_CFLAGS) \
|
$(CLUTTER_CFLAGS) \
|
||||||
$(CLUTTER_DEBUG_CFLAGS) \
|
$(CLUTTER_DEBUG_CFLAGS) \
|
||||||
$(GCC_FLAGS)
|
$(MAINTAINER_CFLAGS)
|
||||||
|
|
||||||
LDADD = $(CLUTTER_LIBS) $(top_builddir)/clutter/x11/libclutter-x11.la
|
LDADD = $(CLUTTER_LIBS) $(top_builddir)/clutter/x11/libclutter-x11.la
|
||||||
|
|
||||||
|
@ -7,7 +7,7 @@ INCLUDES = \
|
|||||||
-I$(top_srcdir)/clutter \
|
-I$(top_srcdir)/clutter \
|
||||||
$(CLUTTER_CFLAGS) \
|
$(CLUTTER_CFLAGS) \
|
||||||
$(CLUTTER_DEBUG_CFLAGS) \
|
$(CLUTTER_DEBUG_CFLAGS) \
|
||||||
$(GCC_FLAGS) \
|
$(MAINTAINER_CFLAGS) \
|
||||||
-xobjective-c
|
-xobjective-c
|
||||||
|
|
||||||
LDADD = $(CLUTTER_LIBS)
|
LDADD = $(CLUTTER_LIBS)
|
||||||
|
@ -10,8 +10,7 @@ INCLUDES = \
|
|||||||
-DCLUTTER_COMPILATION \
|
-DCLUTTER_COMPILATION \
|
||||||
$(CLUTTER_CFLAGS) \
|
$(CLUTTER_CFLAGS) \
|
||||||
$(CLUTTER_DEBUG_CFLAGS) \
|
$(CLUTTER_DEBUG_CFLAGS) \
|
||||||
$(MAINTAINER_CFLAGS) \
|
$(MAINTAINER_CFLAGS)
|
||||||
$(GCC_FLAGS)
|
|
||||||
|
|
||||||
LDADD = $(CLUTTER_LIBS) $(top_builddir)/clutter/x11/libclutter-x11.la
|
LDADD = $(CLUTTER_LIBS) $(top_builddir)/clutter/x11/libclutter-x11.la
|
||||||
|
|
||||||
|
@ -27,6 +27,8 @@ INCLUDES = \
|
|||||||
-DG_LOG_DOMAIN=\"Clutter-Json\" \
|
-DG_LOG_DOMAIN=\"Clutter-Json\" \
|
||||||
-DG_DISABLE_DEPRECATED
|
-DG_DISABLE_DEPRECATED
|
||||||
|
|
||||||
|
AM_CFLAGS = $(MAINTAINER_CFLAGS)
|
||||||
|
|
||||||
clutterjsondir = $(includedir)/clutter-@CLUTTER_MAJORMINOR@/clutter/json
|
clutterjsondir = $(includedir)/clutter-@CLUTTER_MAJORMINOR@/clutter/json
|
||||||
clutterjson_HEADERS = $(source_h)
|
clutterjson_HEADERS = $(source_h)
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@ INCLUDES = \
|
|||||||
-I$(top_builddir)/clutter \
|
-I$(top_builddir)/clutter \
|
||||||
$(CLUTTER_CFLAGS) \
|
$(CLUTTER_CFLAGS) \
|
||||||
$(CLUTTER_DEBUG_CFLAGS) \
|
$(CLUTTER_DEBUG_CFLAGS) \
|
||||||
$(GCC_FLAGS) \
|
$(MAINTAINER_CFLAGS)
|
||||||
-xobjective-c
|
-xobjective-c
|
||||||
|
|
||||||
LDADD = $(CLUTTER_LIBS)
|
LDADD = $(CLUTTER_LIBS)
|
||||||
|
@ -9,7 +9,7 @@ INCLUDES = \
|
|||||||
-I$(top_builddir)/clutter/ \
|
-I$(top_builddir)/clutter/ \
|
||||||
$(CLUTTER_CFLAGS) \
|
$(CLUTTER_CFLAGS) \
|
||||||
$(CLUTTER_DEBUG_CFLAGS) \
|
$(CLUTTER_DEBUG_CFLAGS) \
|
||||||
$(GCC_FLAGS)
|
$(MAINTAINER_CFLAGS)
|
||||||
|
|
||||||
LDADD = $(CLUTTER_LIBS)
|
LDADD = $(CLUTTER_LIBS)
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@ INCLUDES = \
|
|||||||
-I$(top_builddir)/clutter \
|
-I$(top_builddir)/clutter \
|
||||||
$(CLUTTER_CFLAGS) \
|
$(CLUTTER_CFLAGS) \
|
||||||
$(CLUTTER_DEBUG_CFLAGS) \
|
$(CLUTTER_DEBUG_CFLAGS) \
|
||||||
$(GCC_FLAGS)
|
$(MAINTAINER_CFLAGS)
|
||||||
|
|
||||||
LDADD = $(CLUTTER_LIBS)
|
LDADD = $(CLUTTER_LIBS)
|
||||||
|
|
||||||
|
@ -6,8 +6,7 @@ INCLUDES = \
|
|||||||
-I$(top_builddir)/clutter \
|
-I$(top_builddir)/clutter \
|
||||||
$(CLUTTER_CFLAGS) \
|
$(CLUTTER_CFLAGS) \
|
||||||
$(CLUTTER_DEBUG_CFLAGS) \
|
$(CLUTTER_DEBUG_CFLAGS) \
|
||||||
$(MAINTAINER_CFLAGS) \
|
$(MAINTAINER_CFLAGS)
|
||||||
$(GCC_FLAGS)
|
|
||||||
|
|
||||||
LDADD = $(CLUTTER_LIBS)
|
LDADD = $(CLUTTER_LIBS)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user