blob: 81b56f3a1f40c5d628a2c96d5d22bea9ea6d1937 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
From 4de105a2bbd201c8e60f3e8777794a4cd532afdc Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue, 28 Sep 2010 13:52:25 +0000
Subject: build: Add common CFLAGS to the introspection scanner
---
diff --git a/clutter-gtk/Makefile.am b/clutter-gtk/Makefile.am
index 6e267b4..cec5cce 100644
--- a/clutter-gtk/Makefile.am
+++ b/clutter-gtk/Makefile.am
@@ -15,6 +15,8 @@ AM_CPPFLAGS = \
-DCLUTTER_DISABLE_DEPRECATED \
$(CLUTTER_GTK_DEBUG_CFLAGS)
+common_cflags = $(CLUTTER_CFLAGS) $(GTK_CFLAGS)
+
# please, keep these lists sorted alphabetically
sources_c = \
$(srcdir)/gtk-clutter-embed.c \
@@ -36,7 +38,7 @@ lib_LTLIBRARIES = libclutter-gtk-@CLUTTER_GTK_API_VERSION@.la
libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_SOURCES = $(sources_c)
libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_LIBADD = $(CLUTTER_LIBS) $(GTK_LIBS)
libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_LDFLAGS = $(CLUTTER_LT_LDFLAGS)
-libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_CFLAGS = $(MAINTAINER_CFLAGS) $(GTK_CFLAGS) $(CLUTTER_CFLAGS)
+libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_CFLAGS = $(common_cflags) $(MAINTAINER_CFLAGS)
cluttergtkheadersdir = $(includedir)/clutter-1.0/clutter-gtk
cluttergtkheaders_HEADERS = $(sources_h) $(srcdir)/clutter-gtk.h
@@ -48,7 +50,7 @@ GtkClutter-@CLUTTER_GTK_API_VERSION@.gir: $(INTROSPECTION_SCANNER) Makefile libc
$(AM_V_GEN)$(INTROSPECTION_SCANNER) -v \
--namespace GtkClutter --nsversion=@CLUTTER_GTK_API_VERSION@ \
--strip-prefix=GtkClutter \
- $(INCLUDES) $(AM_CPPFLAGS) \
+ $(INCLUDES) $(AM_CPPFLAGS) $(common_cflags) \
--add-include-path=$(srcdir) --add-include=path=. \
--include=Clutter-1.0 \
--include=GdkPixbuf-2.0 \
--
cgit v0.8.3.1-30-gff3a
|
