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

[json] Fix compilation of the internal JSON-GLib

Browse Source 
Define the symbols needed to pass the single include policy when
compiling the static object.
This commit is contained in:
Emmanuele Bassi 2009-08-13 18:05:38 +01:00
parent 6e1f9ad9b6
commit 5c8ae6d2dc
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clutter/json/Makefile.am
View File

@ -25,7 +25,8 @@ INCLUDES = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-DG_DISABLE_SINGLE_INCLUDES \ -DG_DISABLE_SINGLE_INCLUDES \
-DG_LOG_DOMAIN=\"Clutter-Json\" \ -DG_LOG_DOMAIN=\"Clutter-Json\" \
-DG_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED \
-DJSON_COMPILATION
AM_CFLAGS = $(MAINTAINER_CFLAGS) AM_CFLAGS = $(MAINTAINER_CFLAGS)
@ -40,6 +41,7 @@ BUILT_GIRSOURCES =
ClutterJson-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-json.la ClutterJson-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-json.la
$(INTROSPECTION_SCANNER) -v --namespace ClutterJson --nsversion=@CLUTTER_API_VERSION@ \ $(INTROSPECTION_SCANNER) -v --namespace ClutterJson --nsversion=@CLUTTER_API_VERSION@ \
$(INCLUDES) \
--add-include-path=$(srcdir) --add-include-path=. \ --add-include-path=$(srcdir) --add-include-path=. \
--include=GObject-2.0 \ --include=GObject-2.0 \
--library=clutter-json \ --library=clutter-json \

4
clutter/json/json-glib.h
View File

@ -1,8 +1,12 @@
#ifndef __JSON_GLIB_H__ #ifndef __JSON_GLIB_H__
#define __JSON_GLIB_H__ #define __JSON_GLIB_H__
#define __JSON_GLIB_INSIDE__
#include "json-types.h" #include "json-types.h"
#include "json-generator.h" #include "json-generator.h"
#include "json-parser.h" #include "json-parser.h"
#undef __JSON_GLIB_INSIDE__
#endif /* __JSON_GLIB_H__ */ #endif /* __JSON_GLIB_H__ */