]> Pileus Git - ~andy/gtk/blobdiff - gdk/Makefile.am
gdk: Move scratch GC handling to X11
[~andy/gtk] / gdk / Makefile.am
index 37a5b8fab22a78aad84cc737d83cfbeb58f9e77e..b63f502bd9806f58392c14b006ff9cc5440c2934 100644 (file)
@@ -1,5 +1,12 @@
 ## Makefile.am for gtk+/gdk
 include $(top_srcdir)/Makefile.decl
+-include $(INTROSPECTION_MAKEFILE)
+INTROSPECTION_GIRS =
+INTROSPECTION_SCANNER_ARGS = \
+   --add-include-path=../gdk
+INTROSPECTION_COMPILER_ARGS = \
+   --includedir=$(srcdir) \
+   --includedir=.
 
 SUBDIRS = $(gdktarget) . tests
 DIST_SUBDIRS = win32 x11 quartz directfb tests
@@ -19,18 +26,15 @@ EXTRA_DIST +=                       \
        makeenums.pl            \
        makefile.msc            \
        gdk.symbols             \
-       makegdkalias.pl         \
        gdkenumtypes.c.template \
        gdkenumtypes.h.template \
-       abicheck.sh             \
-       pltcheck.sh
+       abicheck.sh
 
 INCLUDES =                              \
        -DG_LOG_DOMAIN=\"Gdk\"          \
        -DGDK_COMPILATION               \
        -I$(top_srcdir)                 \
        -I$(top_builddir)/gdk           \
-       -I$(top_srcdir)/gdk-pixbuf      \
        $(GTK_DEBUG_FLAGS)              \
        $(GDK_DEP_CFLAGS)
 
@@ -44,6 +48,7 @@ endif
 # 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)                                                \
@@ -69,15 +74,14 @@ gdk_public_h_sources =                              \
        gdkcairo.h                              \
        gdkcolor.h                              \
        gdkcursor.h                             \
+       gdkdevice.h                             \
+       gdkdevicemanager.h                      \
        gdkdisplay.h                            \
        gdkdisplaymanager.h                     \
        gdkdnd.h                                \
        gdkdrawable.h                           \
        gdkevents.h                             \
-       gdkfont.h                               \
        gdkgc.h                                 \
-       gdki18n.h                               \
-       gdkimage.h                              \
        gdkinput.h                              \
        gdkkeys.h                               \
        gdkkeysyms.h                            \
@@ -86,8 +90,6 @@ gdk_public_h_sources =                                \
        gdkpixmap.h                             \
        gdkprivate.h                            \
        gdkproperty.h                           \
-       gdkregion.h                             \
-       gdkrgb.h                                \
        gdkscreen.h                             \
        gdkselection.h                          \
        gdkspawn.h                              \
@@ -99,13 +101,11 @@ gdk_public_h_sources =                             \
 gdk_built_public_sources =                     \
        gdkenumtypes.h
 
-gdk_built_private_headers =                    \
-       gdkalias.h
-
-gdk_private_headers =   \
-       gdkinternals.h \
-       gdkpoly-generic.h       \
-       gdkregion-generic.h
+gdk_private_headers =                          \
+       gdkinternals.h                          \
+       gdkdeviceprivate.h                      \
+       gdkintl.h                               \
+       gdkpoly-generic.h
 
 gdk_c_sources =                 \
        $(medialib_sources)     \
@@ -114,15 +114,15 @@ gdk_c_sources =                 \
        gdkcairo.c              \
        gdkcolor.c              \
        gdkcursor.c             \
+       gdkdevice.c             \
+       gdkdevicemanager.c      \
        gdkdisplay.c            \
        gdkdisplaymanager.c     \
        gdkdnd.c                \
        gdkdraw.c               \
        gdkevents.c             \
-       gdkfont.c               \
        gdkgc.c                 \
        gdkglobals.c            \
-       gdkimage.c              \
        gdkkeys.c               \
        gdkkeyuni.c             \
        gdkoffscreenwindow.c    \
@@ -130,10 +130,7 @@ gdk_c_sources =                 \
        gdkpixbuf-drawable.c    \
        gdkpixbuf-render.c      \
        gdkpixmap.c             \
-       gdkpolyreg-generic.c    \
        gdkrectangle.c          \
-       gdkregion-generic.c     \
-       gdkrgb.c                \
        gdkscreen.c             \
        gdkselection.c          \
        gdkvisual.c             \
@@ -141,84 +138,123 @@ gdk_c_sources =                 \
        gdkwindowimpl.c
 
 gdk_built_sources =                            \
-       gdkaliasdef.c                           \
        gdkenumtypes.c                          \
        gdkmarshalers.h                         \
        gdkmarshalers.c                         \
-       $(gdk_built_public_sources)             \
-       $(gdk_built_private_headers)
+       $(gdk_built_public_sources)
 
 #
 # setup GDK sources and their dependencies
 #
 
-gdkincludedir = $(includedir)/gtk-2.0/gdk
+gdkincludedir = $(includedir)/gtk-3.0/gdk
 gdkinclude_HEADERS = $(gdk_public_h_sources) $(gdk_built_public_sources)
 
-common_sources =                \
-       $(gdk_private_headers)      \
-    $(gdk_c_sources)   \
+common_sources =               \
+       $(gdk_private_headers)  \
+       $(gdk_c_sources)        \
        gdkenumtypes.c          \
        gdkmarshalers.c         \
        gdkmarshalers.h
 
-libgdk_directfb_2_0_la_SOURCES = $(common_sources) 
-libgdk_directfb_2_0_la_LIBADD = directfb/libgdk-directfb.la $(GDK_DEP_LIBS) \
-  $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
-libgdk_directfb_2_0_la_LDFLAGS = $(LDADD)
+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_x11_2_0_la_SOURCES = $(common_sources)
-libgdk_x11_2_0_la_LIBADD = x11/libgdk-x11.la $(GDK_DEP_LIBS) \
-  $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
-libgdk_x11_2_0_la_LDFLAGS = $(LDADD)
+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)
 
-libgdk_quartz_2_0_la_SOURCES = $(common_sources) gdkkeynames.c
-libgdk_quartz_2_0_la_LIBADD = quartz/libgdk-quartz.la $(GDK_DEP_LIBS) \
-  $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
-libgdk_quartz_2_0_la_LDFLAGS = $(LDADD)
+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)
 
-libgdk_win32_2_0_la_SOURCES = $(common_sources) gdkkeynames.c
-libgdk_win32_2_0_la_LIBADD = win32/libgdk-win32.la $(GDK_DEP_LIBS) \
-  $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
-libgdk_win32_2_0_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def
-libgdk_win32_2_0_la_LDFLAGS = -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def $(LDADD)
+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 HAVE_INTROSPECTION
-BUILT_GIRSOURCES =
-
-Gdk-2.0.gir: $(INTROSPECTION_SCANNER) $(gdktargetlib) Makefile
-       $(INTROSPECTION_SCANNER) -v \
-               --namespace Gdk --nsversion=2.0 --strip-prefix=Gdk \
-               $(INCLUDES) \
-               --include=Gio-2.0 \
-               --add-include-path=../gdk-pixbuf \
-               --include=GdkPixbuf-2.0 \
-               --include=Pango-1.0 \
-               --library=$(gdktargetlib) \
-               --libtool="$(LIBTOOL)" \
-               --output $@ \
-               $(gdk_public_h_sources) \
-               $(gdk_c_sources) gdkenumtypes.c gdkenumtypes.h
-BUILT_GIRSOURCES += Gdk-2.0.gir
 
-girdir = $(datadir)/gir-1.0
-gir_DATA = $(BUILT_GIRSOURCES)
+introspection_files =          \
+       $(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_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 cairo-1.0
+Gdk_3_0_gir_LIBS = $(gdktargetlib)
+Gdk_3_0_gir_FILES = $(introspection_files)
+Gdk_3_0_gir_CFLAGS = $(INCLUDES)
+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/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/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)
+GdkX11_3_0_gir_FILES = $(x11_introspection_files)
+GdkX11_3_0_gir_CFLAGS = $(INCLUDES) -L$(top_builddir)/gdk
+INTROSPECTION_GIRS += GdkX11-3.0.gir
+endif # USE_X11
 
-typelibsdir = $(libdir)/girepository-1.0/
+girdir = $(datadir)/gir-1.0
+gir_DATA = $(INTROSPECTION_GIRS)
 
-typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
+typelibsdir = $(libdir)/girepository-1.0
+typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
-%.typelib: %.gir $(INTROSPECTION_COMPILER)
-       $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. --includedir=../gdk-pixbuf $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
+CLEANFILES += $(gir_DATA) $(typelibs_DATA)
 
-CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
-endif
+endif # HAVE_INTROSPECTION
 
 if OS_WIN32
 install-def-file: gdk.def
-       $(INSTALL) $(srcdir)/gdk.def $(DESTDIR)$(libdir)/gdk-win32-2.0.def
+       $(INSTALL) $(srcdir)/gdk.def $(DESTDIR)$(libdir)/gdk-win32-3.0.def
 uninstall-def-file:
-       -rm $(DESTDIR)$(libdir)/gdk-win32-2.0.def
+       -rm $(DESTDIR)$(libdir)/gdk-win32-3.0.def
 else
 install-def-file:
 uninstall-def-file:
@@ -245,20 +281,15 @@ endif
 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
 
-gdkalias.h: gdk.symbols
-        $(PERL) $(srcdir)/makegdkalias.pl < $(srcdir)/gdk.symbols > gdkalias.h
-
-gdkaliasdef.c: gdk.symbols
-        $(PERL) $(srcdir)/makegdkalias.pl -def < $(srcdir)/gdk.symbols > gdkaliasdef.c
-
+TESTS_ENVIRONMENT = srcdir="$(srcdir)"
 if OS_LINUX
-TESTS = abicheck.sh pltcheck.sh
+TESTS = abicheck.sh
 endif
 
 
 lib_LTLIBRARIES = $(gdktargetlib)
 
-EXTRA_LTLIBRARIES = libgdk-x11-2.0.la libgdk-win32-2.0.la libgdk-quartz-2.0.la libgdk-directfb-2.0.la
+EXTRA_LTLIBRARIES = libgdk-x11-3.0.la libgdk-win32-3.0.la libgdk-quartz-3.0.la libgdk-directfb-3.0.la
 
 MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h
 EXTRA_DIST += $(gdk_built_sources)
@@ -267,7 +298,7 @@ EXTRA_HEADERS =
 #
 # Rule to install gdkconfig.h header file
 #
-configexecincludedir = $(libdir)/gtk-2.0/include
+configexecincludedir = $(libdir)/gtk-3.0/include
 #configexecinclude_DATA = gdkconfig.h
 
 install-exec-local: gdkconfig.h
@@ -308,7 +339,7 @@ gdkmarshalers.h: @REBUILD@ gdkmarshalers.list
        && mv gdkmarshalers-h.tmp gdkmarshalers.h \
        || ( rm -f gdkmarshalers-h.tmp && exit 1)
 gdkmarshalers.c: @REBUILD@ gdkmarshalers.list
-       (echo "#include \"gdkalias.h\""; $(GLIB_GENMARSHAL) --prefix=_gdk_marshal $(srcdir)/gdkmarshalers.list --body) > gdkmarshalers-c.tmp    \
+       $(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 )
 
@@ -319,6 +350,18 @@ stamp-gc-h: $(top_builddir)/config.status
        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 \
+               case $$F in \
+               *.c) echo '   <File RelativePath="..\..\..\gdk\'$$F'" />' \
+                    ;; \
+               esac; \
+       done >libgdk.sourcefiles
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gdk.vcprojin >$@
+       rm libgdk.sourcefiles
+
 DISTCLEANFILES = gdkconfig.h stamp-gc-h
 
 install-data-local: install-ms-lib install-def-file