-include $(INTROSPECTION_MAKEFILE)
INTROSPECTION_GIRS =
INTROSPECTION_SCANNER_ARGS = \
- --add-include-path=../gdk
+ --add-include-path=../gdk \
+ --warn-all
INTROSPECTION_COMPILER_ARGS = \
--includedir=$(srcdir) \
--includedir=.
SUBDIRS = $(GDK_BACKENDS) . tests
-DIST_SUBDIRS = win32 x11 quartz tests
+DIST_SUBDIRS = win32 x11 quartz broadway tests
CLEANFILES =
-DG_LOG_DOMAIN=\"Gdk\" \
-DGDK_COMPILATION \
-I$(top_srcdir) \
+ -I$(top_builddir) \
-I$(top_builddir)/gdk \
$(GTK_DEBUG_FLAGS) \
$(GDK_DEP_CFLAGS)
gdkvisual.h \
gdkwindow.h
-gdk_built_public_sources = \
- gdkconfig.h \
- gdkenumtypes.h
-
gdk_private_headers = \
gdkapplaunchcontextprivate.h \
gdkcursorprivate.h \
gdkinternals.h \
gdkintl.h \
gdkkeysprivate.h \
- gdkvisualprivate.h
+ gdkvisualprivate.h \
+ gdkx.h
gdk_c_sources = \
gdk.c \
gdkenumtypes.c \
gdkmarshalers.h \
gdkmarshalers.c \
- $(gdk_built_public_sources)
+ gdkenumtypes.h
#
# setup GDK sources and their dependencies
#
gdkincludedir = $(includedir)/gtk-3.0/gdk
-gdkinclude_HEADERS = $(gdk_public_h_sources) $(gdk_built_public_sources)
+gdkinclude_HEADERS = $(gdk_public_h_sources) gdkenumtypes.h
+nodist_gdkinclude_HEADERS = gdkconfig.h
common_sources = \
$(gdk_private_headers) \
gdkmarshalers.c \
gdkmarshalers.h
-libgdk_3_0_la_SOURCES = $(common_sources)
-libgdk_3_0_la_LIBADD = $(GDK_DEP_LIBS)
-libgdk_3_0_la_LDFLAGS = $(LDADD)
+libgdk_3_la_SOURCES = $(common_sources)
+libgdk_3_la_LIBADD = $(GDK_DEP_LIBS)
+libgdk_3_la_LDFLAGS = $(LDADD)
if USE_X11
-libgdk_3_0_la_LIBADD += x11/libgdk-x11.la
+libgdk_3_la_LIBADD += x11/libgdk-x11.la
endif # USE_X11
if USE_QUARTZ
-libgdk_3_0_la_LIBADD += quartz/libgdk-quartz.la
+libgdk_3_la_LIBADD += quartz/libgdk-quartz.la
endif # USE_QUARTZ
if USE_WIN32
-libgdk_3_0_la_SOURCES += gdkkeynames.c
-libgdk_3_0_la_LIBADD += win32/libgdk-win32.la
-libgdk_3_0_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def
-libgdk_3_0_la_LDFLAGS += -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def
+libgdk_3_la_SOURCES += gdkkeynames.c
+libgdk_3_la_LIBADD += win32/libgdk-win32.la
+libgdk_3_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def
+libgdk_3_la_LDFLAGS += -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def
endif # USE_WIN32
+if USE_BROADWAY
+libgdk_3_la_LIBADD += broadway/libgdk-broadway.la
+endif # USE_BROADWAY
+
if HAVE_INTROSPECTION
introspection_files = \
gdkenumtypes.c \
gdkenumtypes.h
-Gdk-3.0.gir: libgdk-3.0.la Makefile
-Gdk_3_0_gir_SCANNERFLAGS = --warn-all
+Gdk-3.0.gir: libgdk-3.la Makefile
+Gdk_3_0_gir_SCANNERFLAGS = \
+ --c-include="gdk/gdk.h"
Gdk_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 cairo-1.0
-Gdk_3_0_gir_LIBS = libgdk-3.0.la
+Gdk_3_0_gir_LIBS = libgdk-3.la
Gdk_3_0_gir_FILES = $(introspection_files)
Gdk_3_0_gir_CFLAGS = $(INCLUDES)
+Gdk_3_0_gir_EXPORT_PACKAGES = gdk-3.0
INTROSPECTION_GIRS += Gdk-3.0.gir
if USE_X11
x11/gdkxid.c \
x11/xsettings-client.c \
x11/xsettings-common.c \
- x11/gdkx.h \
+ x11/gdkx.h \
x11/gdkx11cursor.h \
x11/gdkx11display.h \
x11/gdkx11property.h \
x11/gdkx11visual.h \
x11/gdkx11window.h
-GdkX11-3.0.gir: libgdk-3.0.la Gdk-3.0.gir Makefile
-GdkX11_3_0_gir_SCANNERFLAGS = --warn-all --strip-prefix=Gdk
-GdkX11_3_0_gir_INCLUDES = Gio-2.0 Gdk-3.0 GdkPixbuf-2.0 Pango-1.0 xlib-2.0
-GdkX11_3_0_gir_LIBS = libgdk-3.0.la
+GdkX11-3.0.gir: libgdk-3.la Gdk-3.0.gir Makefile
+GdkX11_3_0_gir_SCANNERFLAGS = \
+ --identifier-prefix=Gdk \
+ --c-include="gdk/gdkx.h" \
+ --include-uninstalled=$(top_builddir)/gdk/Gdk-3.0.gir
+GdkX11_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 xlib-2.0
+GdkX11_3_0_gir_LIBS = libgdk-3.la
GdkX11_3_0_gir_FILES = $(x11_introspection_files)
GdkX11_3_0_gir_CFLAGS = $(INCLUDES) -L$(top_builddir)/gdk
+GdkX11_3_0_gir_EXPORT_PACKAGES = gdk-x11-3.0
INTROSPECTION_GIRS += GdkX11-3.0.gir
-introspection_files += $(filter-out x11/gdkx.h, $(x11_introspection_files))
-
endif # USE_X11
girdir = $(datadir)/gir-1.0
# This places the generated .def file in srcdir, since it is expected to be there.
# (The one from a tarball is)
gdk.def: gdk.symbols
- (echo -e EXPORTS; $(CPP) -P -DGDK_WINDOWING_WIN32 - <$(srcdir)/gdk.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > $(srcdir)/gdk.def
+ $(AM_V_GEN) (echo -e EXPORTS; $(CPP) -P -DGDK_WINDOWING_WIN32 - <$(srcdir)/gdk.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > $(srcdir)/gdk.def
TESTS_ENVIRONMENT = srcdir="$(srcdir)"
if OS_LINUX
TESTS = abicheck.sh
endif
-lib_LTLIBRARIES = libgdk-3.0.la
+lib_LTLIBRARIES = libgdk-3.la
MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h
EXTRA_DIST += $(gdk_built_sources)
-EXTRA_HEADERS =
install-exec-hook:
if DISABLE_EXPLICIT_DEPS
- $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgdk-3.0.la
+ $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgdk-3.la
endif
-#note: not gdkconfig.h
BUILT_SOURCES = \
$(gdk_built_sources) \
gdkconfig.h
gdkenumtypes.h: stamp-gdkenumtypes.h
@true
stamp-gdkenumtypes.h: @REBUILD@ $(gdk_public_h_sources) gdkenumtypes.h.template
- ( cd $(srcdir) && $(GLIB_MKENUMS) --template gdkenumtypes.h.template \
+ $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gdkenumtypes.h.template \
$(gdk_public_h_sources) ) >> xgen-geth \
&& (cmp -s xgen-geth gdkenumtypes.h || cp xgen-geth gdkenumtypes.h ) \
&& rm -f xgen-geth \
&& echo timestamp > $(@F)
gdkenumtypes.c: @REBUILD@ $(gdk_public_h_sources) gdkenumtypes.c.template
- ( cd $(srcdir) && $(GLIB_MKENUMS) --template gdkenumtypes.c.template \
+ $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gdkenumtypes.c.template \
$(gdk_public_h_sources) ) > xgen-getc \
&& cp xgen-getc gdkenumtypes.c \
&& rm -f xgen-getc
-#
+#
# Marshaller generation
#
gdkmarshalers.h: @REBUILD@ gdkmarshalers.list
- $(GLIB_GENMARSHAL) --prefix=_gdk_marshal $(srcdir)/gdkmarshalers.list --header > gdkmarshalers-h.tmp \
+ $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=_gdk_marshal $(srcdir)/gdkmarshalers.list --header > gdkmarshalers-h.tmp \
&& mv gdkmarshalers-h.tmp gdkmarshalers.h \
|| ( rm -f gdkmarshalers-h.tmp && exit 1)
gdkmarshalers.c: @REBUILD@ gdkmarshalers.list
- $(GLIB_GENMARSHAL) --prefix=_gdk_marshal $(srcdir)/gdkmarshalers.list --body > gdkmarshalers-c.tmp \
+ $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=_gdk_marshal $(srcdir)/gdkmarshalers.list --body > gdkmarshalers-c.tmp \
&& mv gdkmarshalers-c.tmp gdkmarshalers.c \
|| ( rm -f gdkmarshalers-c.tmp && exit 1 )
gdkconfig.h: stamp-gc-h
- @if test -f gdkconfig.h; then :; \
+ $(AM_V_GEN) if test -f gdkconfig.h; then :; \
else rm -f stamp-gc-h; $(MAKE) stamp-gc-h; fi
stamp-gc-h: $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status gdk/gdkconfig.h
+ $(AM_V_at) cd $(top_builddir) && $(SHELL) ./config.status gdk/gdkconfig.h
echo timestamp > stamp-gc-h
dist-hook: ../build/win32/vs9/gdk.vcproj
../build/win32/vs9/gdk.vcproj: ../build/win32/vs9/gdk.vcprojin
- for F in $(libgdk_win32_3_0_la_SOURCES); do \
+ for F in $(libgdk_3_la_SOURCES); do \
case $$F in \
*.c) echo ' <File RelativePath="..\..\..\gdk\'$$F'" />' \
;; \
projects / ~andy / gtk / blobdiff