callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use Makefile.introspection

Browse Source 
Use the new fancy rules from the Makefile.introspection, it makes
the rules prettier and avoids quite a bit of duplication
This commit is contained in:
Johan Dahlin
2009-12-14 21:47:39 -02:00
parent 2ada5a9cb9
commit eadc7885da
3 changed files with 56 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
gdk-pixbuf/Makefile.am
View File

@ -1,4 +1,7 @@
include $(top_srcdir)/Makefile.decl include $(top_srcdir)/Makefile.decl
include $(INTROSPECTION_MAKEFILE)
INTROSPECTION_GIRS =
SUBDIRS = pixops SUBDIRS = pixops
@ -687,32 +690,23 @@ EXTRA_DIST += \
gen-color-table.pl gen-color-table.pl
if HAVE_INTROSPECTION if HAVE_INTROSPECTION
BUILT_GIRSOURCES =
GdkPixbuf-2.0.gir: $(INTROSPECTION_SCANNER) libgdk_pixbuf-2.0.la Makefile GdkPixbuf_2_0_gir_SCANNERFLAGS = --strip-prefix=Gdk
$(INTROSPECTION_SCANNER) -v \ GdkPixbuf_2_0_gir_INCLUDES = GModule-2.0 Gio-2.0
--namespace GdkPixbuf --nsversion=2.0 --strip-prefix=Gdk \ GdkPixbuf_2_0_gir_LIBS = libgdk_pixbuf-2.0.la
$(INCLUDES) \ GdkPixbuf_2_0_gir_CFLAGS = $(INCLUDES)
--include=Gio-2.0 \ GdkPixbuf_2_0_gir_FILES = \
--include=GModule-2.0 \ $(addprefix $(srcdir)/,$(libgdk_pixbufinclude_HEADERS)) \
--library=libgdk_pixbuf-2.0.la \ $(addprefix $(srcdir)/,$(libgdk_pixbuf_2_0_la_SOURCES))
--libtool="$(LIBTOOL)" \ INTROSPECTION_GIRS += GdkPixbuf-2.0.gir
--output $@ \
$(addprefix $(srcdir)/,$(libgdk_pixbufinclude_HEADERS)) \
$(addprefix $(srcdir)/,$(libgdk_pixbuf_2_0_la_SOURCES))
BUILT_GIRSOURCES += GdkPixbuf-2.0.gir
girdir = $(datadir)/gir-1.0 girdir = $(INTROSPECTION_GIRDIR)
gir_DATA = $(BUILT_GIRSOURCES) dist_gir_DATA = $(INTROSPECTION_GIRS)
typelibsdir = $(libdir)/girepository-1.0/ typelibsdir = $(INTROSPECTION_TYPELIBDIR)
typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) CLEANFILES += $(dist_gir_DATA) $(typelibs_DATA)
%.typelib: %.gir $(INTROSPECTION_COMPILER)
$(DEBUG) $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
endif endif
if CROSS_COMPILING if CROSS_COMPILING

40
gdk/Makefile.am
View File

@ -1,5 +1,13 @@
## Makefile.am for gtk+/gdk ## Makefile.am for gtk+/gdk
include $(top_srcdir)/Makefile.decl include $(top_srcdir)/Makefile.decl
include $(INTROSPECTION_MAKEFILE)
INTROSPECTION_GIRS =
INTROSPECTION_SCANNER_ARGS = \
--add-include-path=../gdk-pixbuf
INTROSPECTION_COMPILER_ARGS = \
--includedir=$(srcdir) \
--includedir=. \
--includedir=../gdk-pixbuf
SUBDIRS = $(gdktarget) . tests SUBDIRS = $(gdktarget) . tests
DIST_SUBDIRS = win32 x11 quartz directfb tests DIST_SUBDIRS = win32 x11 quartz directfb tests
@ -185,7 +193,6 @@ libgdk_win32_2_0_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.
libgdk_win32_2_0_la_LDFLAGS = -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def $(LDADD) libgdk_win32_2_0_la_LDFLAGS = -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def $(LDADD)
if HAVE_INTROSPECTION if HAVE_INTROSPECTION
BUILT_GIRSOURCES =
introspection_files = \ introspection_files = \
$(gdk_public_h_sources) \ $(gdk_public_h_sources) \
@ -193,31 +200,20 @@ introspection_files = \
gdkenumtypes.c \ gdkenumtypes.c \
gdkenumtypes.h gdkenumtypes.h
Gdk-2.0.gir: $(INTROSPECTION_SCANNER) $(gdktargetlib) Makefile Gdk_2_0_gir_SCANNERFLAGS = --strip-prefix=Gdk --add-include-path=../gdk-pixbuf
$(INTROSPECTION_SCANNER) -v \ Gdk_2_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0
--namespace Gdk --nsversion=2.0 --strip-prefix=Gdk \ Gdk_2_0_gir_LIBS = $(gdktargetlib)
$(INCLUDES) \ Gdk_2_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_files))
--include=Gio-2.0 \ Gdk_2_0_gir_CFLAGS = $(INCLUDES)
--add-include-path=../gdk-pixbuf \ INTROSPECTION_GIRS += Gdk-2.0.gir
--include=GdkPixbuf-2.0 \
--include=Pango-1.0 \
--library=$(gdktargetlib) \
--libtool="$(LIBTOOL)" \
--output $@ \
$(addprefix $(srcdir)/,$(introspection_files))
BUILT_GIRSOURCES += Gdk-2.0.gir
girdir = $(datadir)/gir-1.0 girdir = $(INTROSPECTION_GIRDIR)
gir_DATA = $(BUILT_GIRSOURCES) dist_gir_DATA = $(INTROSPECTION_GIRS)
typelibsdir = $(libdir)/girepository-1.0/
typelibsdir = $(INTROSPECTION_TYPELIBDIR)
typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
%.typelib: %.gir $(INTROSPECTION_COMPILER) CLEANFILES += $(dist_gir_DATA) $(typelibs_DATA)
$(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. --includedir=../gdk-pixbuf $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
endif endif
if OS_WIN32 if OS_WIN32

45
gtk/Makefile.am
View File

@ -1,5 +1,15 @@
# Makefile.am for gtk+/gtk # Makefile.am for gtk+/gtk
include $(top_srcdir)/Makefile.decl 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 if USE_QUARTZ
GTK_PRINT_PREVIEW_COMMAND="open -a /Applications/Preview.app %f" GTK_PRINT_PREVIEW_COMMAND="open -a /Applications/Preview.app %f"
@ -962,8 +972,6 @@ LDADDS = \
$(top_builddir)/gdk/$(gdktargetlib) $(top_builddir)/gdk/$(gdktargetlib)
if HAVE_INTROSPECTION if HAVE_INTROSPECTION
BUILT_GIRSOURCES =
introspection_files = \ introspection_files = \
$(gtkinclude_HEADERS) \ $(gtkinclude_HEADERS) \
$(gtk_all_c_sources) \ $(gtk_all_c_sources) \
@ -971,33 +979,24 @@ introspection_files = \
gtktypebuiltins.c gtktypebuiltins.c
Gtk-2.0.gir: $(INTROSPECTION_SCANNER) $(gtktargetlib) Makefile Gtk-2.0.gir: $(INTROSPECTION_SCANNER) $(gtktargetlib) Makefile
$(INTROSPECTION_SCANNER) -v \ Gtk_2_0_gir_SCANNERFLAGS = --strip-prefix=Gtk
--namespace Gtk --nsversion=2.0 --strip-prefix=Gtk \ Gtk_2_0_gir_INCLUDES = Atk-1.0 Gdk-2.0
Gtk_2_0_gir_CFLAGS = \
$(INCLUDES) \ $(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 \ -UGDK_DISABLE_DEPRECATED \
-UGTK_DISABLE_DEPRECATED \ -UGTK_DISABLE_DEPRECATED \
-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API \ -DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
$(addprefix $(srcdir)/, $(introspection_files)) Gtk_2_0_gir_LIBS = $(gtktargetlib)
BUILT_GIRSOURCES += Gtk-2.0.gir Gtk_2_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
INTROSPECTION_GIRS += Gtk-2.0.gir
girdir = $(datadir)/gir-1.0 girdir = $(INTROSPECTION_GIRDIR)
gir_DATA = $(BUILT_GIRSOURCES) dist_gir_DATA = $(INTROSPECTION_GIRS)
typelibsdir = $(libdir)/girepository-1.0/ typelibsdir = $(INTROSPECTION_TYPELIBDIR)
typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) CLEANFILES += $(dist_gir_DATA) $(typelibs_DATA)
%.typelib: %.gir $(INTROSPECTION_COMPILER)
$(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. --includedir=../gdk-pixbuf --includedir=../gdk $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
endif endif
# #