diff options
| author | Johan Dahlin <johan@gnome.org> | 2009-12-14 21:47:39 -0200 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-04-03 20:51:54 -0400 |
| commit | 3a4f027074ad22ee054a957bc202c375595049f3 (patch) | |
| tree | 0e12e42d68c7e2bfc89922ba38a4fc2a8efe0312 /gtk/Makefile.am | |
| parent | a8bf73cfa7bb76176d502e8dad9d17e1a3c98b4c (diff) | |
| download | gtk+-3a4f027074ad22ee054a957bc202c375595049f3.tar.gz | |
Use Makefile.introspection
Use the new fancy rules from the Makefile.introspection, it makes
the rules prettier and avoids quite a bit of duplication
Diffstat (limited to 'gtk/Makefile.am')
| -rw-r--r-- | gtk/Makefile.am | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/gtk/Makefile.am b/gtk/Makefile.am index ed1f5d7ed1..d1307f659a 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -1,5 +1,15 @@ # Makefile.am for gtk+/gtk include $(top_srcdir)/Makefile.decl +include $(INTROSPECTION_MAKEFILE) +INTROSPECTION_GIRS = +INTROSPECTION_SCANNER_ARGS = \ + --add-include-path=../gdk-pixbuf \ + --add-include-path=../gdk +INTROSPECTION_COMPILER_ARGS = \ + --includedir=$(srcdir) \ + --includedir=. \ + --includedir=../gdk-pixbuf \ + --includedir=../gdk if USE_QUARTZ GTK_PRINT_PREVIEW_COMMAND="open -a /Applications/Preview.app %f" @@ -964,8 +974,6 @@ LDADDS = \ $(top_builddir)/gdk/$(gdktargetlib) if HAVE_INTROSPECTION -BUILT_GIRSOURCES = - introspection_files = \ $(gtkinclude_HEADERS) \ $(gtk_all_c_sources) \ @@ -973,33 +981,24 @@ introspection_files = \ gtktypebuiltins.c Gtk-2.0.gir: $(INTROSPECTION_SCANNER) $(gtktargetlib) Makefile - $(INTROSPECTION_SCANNER) -v \ - --namespace Gtk --nsversion=2.0 --strip-prefix=Gtk \ +Gtk_2_0_gir_SCANNERFLAGS = --strip-prefix=Gtk +Gtk_2_0_gir_INCLUDES = Atk-1.0 Gdk-2.0 +Gtk_2_0_gir_CFLAGS = \ $(INCLUDES) \ - --add-include-path=../gdk \ - --add-include-path=../gdk-pixbuf \ - --include=Gdk-2.0 \ - --include=Atk-1.0 \ - --library=$(gtktargetlib) \ - --libtool="$(LIBTOOL)" \ - --output $@ \ -UGDK_DISABLE_DEPRECATED \ -UGTK_DISABLE_DEPRECATED \ - -DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API \ - $(addprefix $(srcdir)/, $(introspection_files)) -BUILT_GIRSOURCES += Gtk-2.0.gir - -girdir = $(datadir)/gir-1.0 -gir_DATA = $(BUILT_GIRSOURCES) - -typelibsdir = $(libdir)/girepository-1.0/ + -DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API +Gtk_2_0_gir_LIBS = $(gtktargetlib) +Gtk_2_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files)) +INTROSPECTION_GIRS += Gtk-2.0.gir -typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) +girdir = $(INTROSPECTION_GIRDIR) +dist_gir_DATA = $(INTROSPECTION_GIRS) -%.typelib: %.gir $(INTROSPECTION_COMPILER) - $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. --includedir=../gdk-pixbuf --includedir=../gdk $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) +typelibsdir = $(INTROSPECTION_TYPELIBDIR) +typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) -CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) +CLEANFILES += $(dist_gir_DATA) $(typelibs_DATA) endif # |