X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gdk%2FMakefile.am;h=7b40c5ffd7a4359c3cb20b25bb7c918d2d018c47;hb=3eef3290ad42fa7b615cfbca37551de490de71ef;hp=910ddbb9ed5792eb6ed373b5c0a7a56fda124375;hpb=654aca5ccde4cc0c88d5523f603ae3c970d24191;p=~andy%2Fgtk diff --git a/gdk/Makefile.am b/gdk/Makefile.am index 910ddbb9e..7b40c5ffd 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -3,19 +3,21 @@ include $(top_srcdir)/Makefile.decl -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 wayland tests CLEANFILES = EXTRA_DIST += \ keynames.txt \ + keynames-translate.txt \ keyname-table.h \ gdkkeynames.c \ gen-keyname-table.pl \ @@ -24,19 +26,19 @@ EXTRA_DIST += \ gdk.def \ gdkmarshalers.list \ gdkwindowimpl.h \ - makeenums.pl \ makefile.msc \ gdk.symbols \ gdkenumtypes.c.template \ gdkenumtypes.h.template \ + gdkversionmacros.h.in \ abicheck.sh -INCLUDES = \ +AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"Gdk\" \ -DGDK_COMPILATION \ - -I$(top_srcdir) \ -I$(top_builddir) \ -I$(top_builddir)/gdk \ + -I$(top_srcdir) \ $(GTK_DEBUG_FLAGS) \ $(GDK_DEP_CFLAGS) @@ -73,11 +75,13 @@ gdk_public_h_sources = \ gdkdisplaymanager.h \ gdkdnd.h \ gdkevents.h \ + gdkframetimings.h \ gdkkeys.h \ gdkkeysyms.h \ gdkkeysyms-compat.h \ gdkmain.h \ gdkpango.h \ + gdkframeclock.h \ gdkpixbuf.h \ gdkprivate.h \ gdkproperty.h \ @@ -91,10 +95,6 @@ gdk_public_h_sources = \ gdkvisual.h \ gdkwindow.h -gdk_built_public_sources = \ - gdkconfig.h \ - gdkenumtypes.h - gdk_private_headers = \ gdkapplaunchcontextprivate.h \ gdkcursorprivate.h \ @@ -103,11 +103,14 @@ gdk_private_headers = \ gdkdisplaymanagerprivate.h \ gdkdisplayprivate.h \ gdkdndprivate.h \ + gdkframeclockidle.h \ + gdkframeclockprivate.h \ gdkscreenprivate.h \ gdkinternals.h \ gdkintl.h \ gdkkeysprivate.h \ - gdkvisualprivate.h + gdkvisualprivate.h \ + gdkx.h gdk_c_sources = \ gdk.c \ @@ -115,16 +118,20 @@ gdk_c_sources = \ gdkcairo.c \ gdkcolor.c \ gdkcursor.c \ + gdkdeprecated.c \ gdkdevice.c \ gdkdevicemanager.c \ gdkdisplay.c \ gdkdisplaymanager.c \ gdkdnd.c \ gdkevents.c \ + gdkframetimings.c \ gdkglobals.c \ gdkkeys.c \ gdkkeyuni.c \ gdkoffscreenwindow.c \ + gdkframeclock.c \ + gdkframeclockidle.c \ gdkpango.c \ gdkpixbuf-drawable.c \ gdkrectangle.c \ @@ -139,14 +146,16 @@ gdk_built_sources = \ gdkenumtypes.c \ gdkmarshalers.h \ gdkmarshalers.c \ - $(gdk_built_public_sources) + gdkversionmacros.h \ + 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 gdkversionmacros.h +nodist_gdkinclude_HEADERS = gdkconfig.h common_sources = \ $(gdk_private_headers) \ @@ -155,25 +164,33 @@ common_sources = \ 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 USE_WAYLAND +libgdk_3_la_LIBADD += wayland/libgdk-wayland.la +endif + if HAVE_INTROSPECTION introspection_files = \ @@ -182,27 +199,26 @@ introspection_files = \ gdkenumtypes.c \ gdkenumtypes.h -Gdk-3.0.gir: libgdk-3.0.la Makefile -Gdk_3_0_gir_SCANNERFLAGS = --warn-all --c-include="gdk/gdk.h" +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_CFLAGS = $(AM_CPPFLAGS) +Gdk_3_0_gir_EXPORT_PACKAGES = gdk-3.0 INTROSPECTION_GIRS += Gdk-3.0.gir if USE_X11 x11_introspection_files = \ - x11/checksettings.c \ x11/gdkapplaunchcontext-x11.c \ x11/gdkasync.c \ x11/gdkcursor-x11.c \ x11/gdkdevice-core-x11.c \ x11/gdkdevicemanager-core-x11.c \ x11/gdkdevicemanager-x11.c \ - x11/gdkdevicemanager-xi.c \ x11/gdkdevicemanager-xi2.c \ x11/gdkdevice-xi2.c \ - x11/gdkdevice-xi.c \ x11/gdkdisplay-x11.c \ x11/gdkdnd-x11.c \ x11/gdkeventsource.c \ @@ -221,7 +237,7 @@ x11_introspection_files = \ 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 \ @@ -231,12 +247,16 @@ x11_introspection_files = \ 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_CFLAGS = $(AM_CPPFLAGS) -L$(top_builddir)/gdk +GdkX11_3_0_gir_EXPORT_PACKAGES = gdk-x11-3.0 INTROSPECTION_GIRS += GdkX11-3.0.gir endif # USE_X11 @@ -289,18 +309,18 @@ 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 = +EXTRA_DIST += \ + $(gdk_built_sources) \ + fallback-c89.c 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 @@ -327,7 +347,8 @@ gdkmarshalers.h: @REBUILD@ gdkmarshalers.list && mv gdkmarshalers-h.tmp gdkmarshalers.h \ || ( rm -f gdkmarshalers-h.tmp && exit 1) gdkmarshalers.c: @REBUILD@ gdkmarshalers.list - $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=_gdk_marshal $(srcdir)/gdkmarshalers.list --body > gdkmarshalers-c.tmp \ + $(AM_V_GEN) (echo "#include \"gdkmarshalers.h\""; \ + $(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 ) @@ -338,10 +359,10 @@ stamp-gc-h: $(top_builddir)/config.status $(AM_V_at) cd $(top_builddir) && $(SHELL) ./config.status gdk/gdkconfig.h echo timestamp > stamp-gc-h -dist-hook: ../build/win32/vs9/gdk.vcproj +dist-hook: ../build/win32/vs9/gdk.vcproj ../build/win32/vs10/gdk.vcxproj ../build/win32/vs10/gdk.vcxproj.filters ../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 ' ' \ ;; \ @@ -349,6 +370,26 @@ dist-hook: ../build/win32/vs9/gdk.vcproj done >libgdk.sourcefiles $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gdk.vcprojin >$@ rm libgdk.sourcefiles + +../build/win32/vs10/gdk.vcxproj: ../build/win32/vs10/gdk.vcxprojin + for F in $(libgdk_3_la_SOURCES); do \ + case $$F in \ + *.c) echo ' ' \ + ;; \ + esac; \ + done >libgdk.vs10.sourcefiles + $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gdk.vcxprojin >$@ + rm libgdk.vs10.sourcefiles + +../build/win32/vs10/gdk.vcxproj.filters: ../build/win32/vs10/gdk.vcxproj.filtersin + for F in $(libgdk_3_la_SOURCES); do \ + case $$F in \ + *.c) echo ' Source Files' \ + ;; \ + esac; \ + done >libgdk.vs10.sourcefiles.filters + $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gdk.vcxproj.filtersin >$@ + rm libgdk.vs10.sourcefiles.filters DISTCLEANFILES = gdkconfig.h stamp-gc-h