[discident-glib] build: Update gobject-introspection support
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [discident-glib] build: Update gobject-introspection support
- Date: Thu, 16 Dec 2010 19:10:17 +0000 (UTC)
commit c0febce966380e274a24285ab39f7c481e7774d6
Author: Bastien Nocera <hadess hadess net>
Date: Tue Nov 9 18:46:43 2010 +0000
build: Update gobject-introspection support
discident-glib/Makefile.am | 50 +++++++++++++++++++++----------------------
1 files changed, 24 insertions(+), 26 deletions(-)
---
diff --git a/discident-glib/Makefile.am b/discident-glib/Makefile.am
index b31a5d8..5ed739e 100644
--- a/discident-glib/Makefile.am
+++ b/discident-glib/Makefile.am
@@ -5,9 +5,12 @@ BUILT_GIRSOURCES =
lib_LTLIBRARIES = libdiscident-glib.la
-libdiscident_glib_la_SOURCES = \
+public_files = \
discident-glib.c \
- discident-glib.h \
+ discident-glib.h
+
+libdiscident_glib_la_SOURCES = \
+ $(public_files) \
discident-glib-private.h
libdiscident_glib_la_LIBADD = $(DISCIDENT_LIBS)
@@ -23,39 +26,34 @@ diglib_HEADERS = discident-glib.h
AM_CFLAGS = -I$(srcdir) $(DISCIDENT_CFLAGS) $(COMMON_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED)
+-include $(INTROSPECTION_MAKEFILE)
+INTROSPECTION_GIRS =
+INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(srcdir)
+INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+CLEANFILES =
+
if HAVE_INTROSPECTION
-BUILT_GIRSOURCES += DiscidentGlib-1.0.gir
+introspection_files = $(public_files)
-DiscidentGlib-1.0.gir: $(libdiscident_glib_la_SOURCES)
-DiscidentGlib-1.0.gir: $(diglib_HEADERS)
DiscidentGlib-1.0.gir: libdiscident-glib.la
-DiscidentGlib-1.0.gir: $(INTROSPECTION_SCANNER)
- $(AM_V_GEN) $(INTROSPECTION_SCANNER) -v --namespace DiscidentGlib --nsversion=1.0 \
- --add-include-path=$(srcdir) --add-include-path=. \
- --include=Gio-2.0 \
- --libtool="$(LIBTOOL)" \
- --library=discident-glib \
- --output $@ \
- --pkg gio-2.0 \
- -I$(srcdir) \
- $(DISCIDENT_CFLAGS) \
- $(srcdir)/$(diglib_HEADERS)
-
-girdir = $(INTROSPECTION_GIRDIR)
-dist_gir_DATA = $(BUILT_GIRSOURCES)
+DiscidentGlib_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0
+DiscidentGlib_1_0_gir_PACKAGES = gobject-2.0 gmodule-2.0 glib-2.0 gio-2.0
+DiscidentGlib_1_0_gir_CFLAGS = -I$(srcdir)
+DiscidentGlib_1_0_gir_LIBS = libdiscident-glib.la
+DiscidentGlib_1_0_gir_SCANNERFLAGS = --symbol-prefix=discident_ --identifier-prefix=Discident --pkg-export=discident-glib-1.0
+DiscidentGlib_1_0_gir_FILES = $(introspection_files)
+INTROSPECTION_GIRS += DiscidentGlib-1.0.gir
-EXTRA_DIST += $(BUILT_GIRSOURCES)
+girdir = $(datadir)/gir-1.0
+gir_DATA = $(INTROSPECTION_GIRS)
-typelibsdir = $(INTROSPECTION_TYPELIBDIR)
-typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
+typelibdir = $(libdir)/girepository-1.0
+typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
-%.typelib: %.gir $(G_IR_COMPILER)
- $(AM_V_GEN) LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $@
+CLEANFILES += $(gir_DATA) $(typelib_DATA)
endif # HAVE_INTROSPECTION
-CLEANFILES = $(BUILT_SOURCES) $(BUILT_GIRSOURCES) $(BUILT_GIRSOURCES:.gir=.typelib)
-
TEST_PROGS += test-diglib
noinst_PROGRAMS = $(TEST_PROGS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]