X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gdk%2FMakefile.am;h=2cd935379b399c0d9e6a362c2d639026cb2b05c9;hb=e97262489c70a12460ea4b938008a470ab0d7581;hp=51dd0f478ea40dc9d22b0f4054deb0950c8478fd;hpb=d18abf42b74b20384bc86107185be151a12ec231;p=~andy%2Fgtk diff --git a/gdk/Makefile.am b/gdk/Makefile.am index 51dd0f478..2cd935379 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -3,43 +3,45 @@ 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 = $(gdktarget) . tests -DIST_SUBDIRS = win32 x11 quartz directfb tests +SUBDIRS = $(GDK_BACKENDS) . tests + +DIST_SUBDIRS = win32 x11 quartz broadway wayland tests CLEANFILES = -EXTRA_DIST += \ +EXTRA_DIST += \ keynames.txt \ + keynames-translate.txt \ keyname-table.h \ + gdkkeynames.c \ gen-keyname-table.pl \ - gdkconfig.h.win32 \ + gdkconfig.h.win32 \ gdkkeysyms-update.pl \ - gdk.def \ + gdk.def \ gdkmarshalers.list \ - gdkmedialib.h \ 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 \ - $(GTK_DEBUG_FLAGS) \ + -I$(top_srcdir) \ + $(GTK_DEBUG_FLAGS) \ $(GDK_DEP_CFLAGS) -gtarget=$(gdktarget) - if PLATFORM_WIN32 no_undefined = -no-undefined endif @@ -47,28 +49,21 @@ endif # libtool stuff: set version and export symbols for resolving # since automake doesn't support conditionalized libsomething_la_LDFLAGS # we use the general approach here -LDADD = \ - $(GTK_LINK_FLAGS) \ - -version-info $(LT_VERSION_INFO) \ - -export-dynamic \ - -rpath $(libdir) \ - $(no_undefined) \ +LDADD = \ + $(GTK_LINK_FLAGS) \ + -version-info $(LT_VERSION_INFO) \ + -export-dynamic \ + -rpath $(libdir) \ + $(no_undefined) \ $(LIBTOOL_EXPORT_OPTIONS) -if USE_MEDIALIB -medialib_sources = \ - gdkmedialib.c -else -medialib_sources = -endif - # # setup source file variables # # # GDK header files for public installation (non-generated) # -gdk_public_h_sources = \ +gdk_public_h_sources = \ gdk.h \ gdkapplaunchcontext.h \ gdkcairo.h \ @@ -79,78 +74,88 @@ gdk_public_h_sources = \ gdkdisplay.h \ gdkdisplaymanager.h \ gdkdnd.h \ - gdkdrawable.h \ gdkevents.h \ - gdkgc.h \ - gdkimage.h \ - gdkinput.h \ + gdkframetimings.h \ gdkkeys.h \ gdkkeysyms.h \ + gdkkeysyms-compat.h \ + gdkmain.h \ gdkpango.h \ + gdkframeclock.h \ gdkpixbuf.h \ - gdkpixmap.h \ gdkprivate.h \ gdkproperty.h \ + gdkrectangle.h \ + gdkrgba.h \ gdkscreen.h \ gdkselection.h \ - gdkspawn.h \ gdktestutils.h \ + gdkthreads.h \ gdktypes.h \ gdkvisual.h \ gdkwindow.h -gdk_built_public_sources = \ - gdkenumtypes.h - -gdk_private_headers = \ - gdkinternals.h \ +gdk_private_headers = \ + gdkapplaunchcontextprivate.h \ + gdkcursorprivate.h \ + gdkdevicemanagerprivate.h \ gdkdeviceprivate.h \ + gdkdisplaymanagerprivate.h \ + gdkdisplayprivate.h \ + gdkdndprivate.h \ + gdkframeclockidle.h \ + gdkframeclockprivate.h \ + gdkscreenprivate.h \ + gdkinternals.h \ gdkintl.h \ - gdkpoly-generic.h - -gdk_c_sources = \ - $(medialib_sources) \ - gdk.c \ - gdkapplaunchcontext.c \ - gdkcairo.c \ - gdkcolor.c \ - gdkcursor.c \ - gdkdevice.c \ - gdkdevicemanager.c \ - gdkdisplay.c \ - gdkdisplaymanager.c \ - gdkdnd.c \ - gdkdraw.c \ - gdkevents.c \ - gdkgc.c \ - gdkglobals.c \ - gdkimage.c \ - gdkkeys.c \ - gdkkeyuni.c \ - gdkoffscreenwindow.c \ - gdkpango.c \ - gdkpixbuf-drawable.c \ - gdkpixbuf-render.c \ - gdkpixmap.c \ - gdkrectangle.c \ - gdkscreen.c \ - gdkselection.c \ - gdkvisual.c \ - gdkwindow.c \ + gdkkeysprivate.h \ + gdkvisualprivate.h \ + gdkx.h + +gdk_c_sources = \ + gdk.c \ + gdkapplaunchcontext.c \ + 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 \ + gdkrgba.c \ + gdkscreen.c \ + gdkselection.c \ + gdkvisual.c \ + gdkwindow.c \ gdkwindowimpl.c -gdk_built_sources = \ +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) \ @@ -159,88 +164,100 @@ common_sources = \ gdkmarshalers.c \ gdkmarshalers.h -libgdk_directfb_3_0_la_SOURCES = $(common_sources) -libgdk_directfb_3_0_la_LIBADD = directfb/libgdk-directfb.la $(GDK_DEP_LIBS) -libgdk_directfb_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_la_LIBADD += x11/libgdk-x11.la +endif # USE_X11 -libgdk_x11_3_0_la_SOURCES = $(common_sources) -libgdk_x11_3_0_la_LIBADD = x11/libgdk-x11.la $(GDK_DEP_LIBS) -libgdk_x11_3_0_la_LDFLAGS = $(LDADD) +if USE_QUARTZ +libgdk_3_la_LIBADD += quartz/libgdk-quartz.la +endif # USE_QUARTZ -libgdk_quartz_3_0_la_SOURCES = $(common_sources) gdkkeynames.c -libgdk_quartz_3_0_la_LIBADD = quartz/libgdk-quartz.la $(GDK_DEP_LIBS) -libgdk_quartz_3_0_la_LDFLAGS = $(LDADD) +if USE_WIN32 +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 -libgdk_win32_3_0_la_SOURCES = $(common_sources) gdkkeynames.c -libgdk_win32_3_0_la_LIBADD = win32/libgdk-win32.la $(GDK_DEP_LIBS) -libgdk_win32_3_0_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def -libgdk_win32_3_0_la_LDFLAGS = -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def $(LDADD) +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 = \ - $(gdk_public_h_sources) \ + $(filter-out gdkkeysyms-compat.h, $(gdk_public_h_sources)) \ $(gdk_c_sources) \ gdkenumtypes.c \ gdkenumtypes.h -Gdk-3.0.gir: $(gdktargetlib) Makefile -Gdk_3_0_gir_SCANNERFLAGS = --strip-prefix=Gdk +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 = $(gdktargetlib) +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/gdkcolor-x11.c \ x11/gdkcursor-x11.c \ - x11/gdkdevice-core.c \ - x11/gdkdevicemanager-core.c \ + x11/gdkdevice-core-x11.c \ + x11/gdkdevicemanager-core-x11.c \ x11/gdkdevicemanager-x11.c \ x11/gdkdevicemanager-xi2.c \ - x11/gdkdevicemanager-xi.c \ x11/gdkdevice-xi2.c \ - x11/gdkdevice-xi.c \ x11/gdkdisplay-x11.c \ x11/gdkdnd-x11.c \ - x11/gdkdrawable-x11.c \ x11/gdkeventsource.c \ x11/gdkeventtranslator.c \ - x11/gdkgc-x11.c \ x11/gdkgeometry-x11.c \ - x11/gdkglobals-x11.c \ - x11/gdkimage-x11.c \ - x11/gdkim-x11.c \ - x11/gdkinput.c \ x11/gdkkeys-x11.c \ x11/gdkmain-x11.c \ - x11/gdkpixmap-x11.c \ x11/gdkproperty-x11.c \ x11/gdkscreen-x11.c \ x11/gdkselection-x11.c \ x11/gdksettings.c \ - x11/gdkspawn-x11.c \ x11/gdktestutils-x11.c \ x11/gdkvisual-x11.c \ x11/gdkwindow-x11.c \ x11/gdkxftdefaults.c \ x11/gdkxid.c \ x11/xsettings-client.c \ - x11/xsettings-common.c \ - x11/gdkx.h - -GdkX11-3.0.gir: $(gdktargetlib) Gdk-3.0.gir Makefile -GdkX11_3_0_gir_SCANNERFLAGS = --strip-prefix=gdk_x11 -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 = $(gdktargetlib) + x11/gdkx.h \ + x11/gdkx11cursor.h \ + x11/gdkx11display.h \ + x11/gdkx11property.h \ + x11/gdkx11screen.h \ + x11/gdkx11selection.h \ + x11/gdkx11utils.h \ + x11/gdkx11visual.h \ + x11/gdkx11window.h + +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 girdir = $(datadir)/gir-1.0 @@ -255,6 +272,7 @@ endif # HAVE_INTROSPECTION if OS_WIN32 install-def-file: gdk.def + mkdir -p $(DESTDIR)$(libdir) $(INSTALL) $(srcdir)/gdk.def $(DESTDIR)$(libdir)/gdk-win32-3.0.def uninstall-def-file: -rm $(DESTDIR)$(libdir)/gdk-win32-3.0.def @@ -270,6 +288,7 @@ gdk-win32-$(GTK_API_VERSION).lib: libgdk-win32-$(GTK_API_VERSION).la gdk.def lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgdk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gdk.def -out:$@ install-ms-lib: + mkdir -p $(DESTDIR)$(libdir) $(INSTALL) gdk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir) uninstall-ms-lib: @@ -282,40 +301,25 @@ endif # 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 -DALL_FILES -DGDK_WINDOWING_WIN32 -DINCLUDE_VARIABLES - <$(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 = $(gdktargetlib) - -EXTRA_LTLIBRARIES = libgdk-x11-3.0.la libgdk-win32-3.0.la libgdk-quartz-3.0.la libgdk-directfb-3.0.la +lib_LTLIBRARIES = libgdk-3.la MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h -EXTRA_DIST += $(gdk_built_sources) -EXTRA_HEADERS = - -# -# Rule to install gdkconfig.h header file -# -configexecincludedir = $(libdir)/gtk-3.0/include -#configexecinclude_DATA = gdkconfig.h - -install-exec-local: gdkconfig.h - $(mkinstalldirs) $(DESTDIR)$(configexecincludedir) - file=$(DESTDIR)$(configexecincludedir)/gdkconfig.h; \ - if test -r $$file && cmp -s gdkconfig.h $$file; then :; \ - else $(INSTALL_DATA) gdkconfig.h $$file; fi +EXTRA_DIST += \ + $(gdk_built_sources) \ + fallback-c89.c install-exec-hook: if DISABLE_EXPLICIT_DEPS - $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/$(gdktargetlib) + $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgdk-3.la endif -#note: not gdkconfig.h BUILT_SOURCES = \ $(gdk_built_sources) \ gdkconfig.h @@ -323,40 +327,41 @@ BUILT_SOURCES = \ 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) (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 ) 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 +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 ' ' \ ;; \ @@ -364,6 +369,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