]> Pileus Git - ~andy/gtk/blobdiff - gdk/Makefile.am
Make 3.0 parallel-installable to 2.x
[~andy/gtk] / gdk / Makefile.am
index 4384dad5fba1d6c165f53de5135652f23037231a..c0bfea01c4491a773a99d65f47805a14c2abfe72 100644 (file)
@@ -1,18 +1,37 @@
 ## Makefile.am for gtk+/gdk
-
-SUBDIRS = $(gdktarget)
-DIST_SUBDIRS = linux-fb win32 x11
-
-EXTRA_DIST =                   \
+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
+DIST_SUBDIRS = win32 x11 quartz directfb tests
+
+CLEANFILES =
+
+EXTRA_DIST +=                  \
+       keynames.txt            \
+       keyname-table.h         \
+       gen-keyname-table.pl    \
        gdkconfig.h.win32       \
+       gdkkeysyms-update.pl    \
        gdk.def                 \
        gdkmarshalers.list      \
+       gdkmedialib.h           \
+       gdkwindowimpl.h         \
        makeenums.pl            \
        makefile.msc            \
        gdk.symbols             \
        makegdkalias.pl         \
-       gdkaliasdef.c           \
-       abicheck.sh
+       gdkenumtypes.c.template \
+       gdkenumtypes.h.template \
+       abicheck.sh             \
+       pltcheck.sh
 
 INCLUDES =                              \
        -DG_LOG_DOMAIN=\"Gdk\"          \
@@ -20,9 +39,6 @@ INCLUDES =                              \
        -I$(top_srcdir)                 \
        -I$(top_builddir)/gdk           \
        -I$(top_srcdir)/gdk-pixbuf      \
-       -DG_DISABLE_DEPRECATED          \
-       -DGDK_PIXBUF_DISABLE_DEPRECATED \
-       -DGDK_DISABLE_DEPRECATED        \
        $(GTK_DEBUG_FLAGS)              \
        $(GDK_DEP_CFLAGS)
 
@@ -42,6 +58,12 @@ LDADD = \
        $(no_undefined)                                                 \
        $(LIBTOOL_EXPORT_OPTIONS)
 
+if USE_MEDIALIB
+medialib_sources =  \
+    gdkmedialib.c
+else
+medialib_sources =
+endif
 
 #
 # setup source file variables
@@ -51,123 +73,165 @@ LDADD = \
 #
 gdk_public_h_sources =                         \
        gdk.h                                   \
+       gdkapplaunchcontext.h                   \
        gdkcairo.h                              \
        gdkcolor.h                              \
        gdkcursor.h                             \
        gdkdisplay.h                            \
+       gdkdisplaymanager.h                     \
        gdkdnd.h                                \
        gdkdrawable.h                           \
        gdkevents.h                             \
        gdkfont.h                               \
        gdkgc.h                                 \
-       gdkkeysyms.h                            \
-       gdki18n.h                               \
        gdkimage.h                              \
        gdkinput.h                              \
        gdkkeys.h                               \
-       gdkdisplaymanager.h                     \
+       gdkkeysyms.h                            \
        gdkpango.h                              \
        gdkpixbuf.h                             \
        gdkpixmap.h                             \
+       gdkprivate.h                            \
        gdkproperty.h                           \
        gdkregion.h                             \
        gdkrgb.h                                \
        gdkscreen.h                             \
        gdkselection.h                          \
        gdkspawn.h                              \
+       gdktestutils.h                          \
        gdktypes.h                              \
        gdkvisual.h                             \
        gdkwindow.h
 
-gdk_headers =                     \
-       $(gdk_public_h_sources)   \
-       gdkenumtypes.h            \
-       gdkprivate.h              \
+gdk_built_public_sources =                     \
+       gdkenumtypes.h
+
+gdk_built_private_headers =                    \
        gdkalias.h
 
+gdk_private_headers =   \
+       gdkinternals.h \
+       gdkintl.h \
+    gdkpoly-generic.h  \
+       gdkregion-generic.h
+
 gdk_c_sources =                 \
+       $(medialib_sources)     \
        gdk.c                   \
+       gdkapplaunchcontext.c   \
        gdkcairo.c              \
        gdkcolor.c              \
        gdkcursor.c             \
        gdkdisplay.c            \
+       gdkdisplaymanager.c     \
        gdkdnd.c                \
        gdkdraw.c               \
        gdkevents.c             \
        gdkfont.c               \
        gdkgc.c                 \
        gdkglobals.c            \
+       gdkimage.c              \
        gdkkeys.c               \
        gdkkeyuni.c             \
-       gdkimage.c              \
-       gdkinternals.h          \
-       gdkintl.h               \
-       gdkdisplaymanager.c     \
+       gdkoffscreenwindow.c    \
        gdkpango.c              \
        gdkpixbuf-drawable.c    \
        gdkpixbuf-render.c      \
        gdkpixmap.c             \
-       gdkpoly-generic.h       \
        gdkpolyreg-generic.c    \
-       gdkrgb.c                \
        gdkrectangle.c          \
        gdkregion-generic.c     \
-       gdkregion-generic.h     \
+       gdkrgb.c                \
        gdkscreen.c             \
        gdkselection.c          \
        gdkvisual.c             \
-       gdkwindow.c
+       gdkwindow.c             \
+       gdkwindowimpl.c
+
+gdk_built_sources =                            \
+       gdkaliasdef.c                           \
+       gdkenumtypes.c                          \
+       gdkmarshalers.h                         \
+       gdkmarshalers.c                         \
+       $(gdk_built_public_sources)             \
+       $(gdk_built_private_headers)
 
 #
 # setup GDK sources and their dependencies
 #
 
-gdkincludedir = $(includedir)/gtk-2.0/gdk
-gdkinclude_HEADERS = $(gdk_headers)
+gdkincludedir = $(includedir)/gtk-3.0/gdk
+gdkinclude_HEADERS = $(gdk_public_h_sources) $(gdk_built_public_sources)
 
-# gdkmarshalers.c is not here because it is currently an empty file
 common_sources =                \
-       $(gdk_c_sources)        \
+       $(gdk_private_headers)      \
+    $(gdk_c_sources)   \
        gdkenumtypes.c          \
+       gdkmarshalers.c         \
        gdkmarshalers.h
 
-libgdk_x11_2_0_la_SOURCES = $(common_sources)
-libgdk_x11_2_0_la_LIBADD = x11/libgdk-x11.la $(GDK_DEP_LIBS) \
+libgdk_directfb_3_0_la_SOURCES = $(common_sources) 
+libgdk_directfb_3_0_la_LIBADD = directfb/libgdk-directfb.la $(GDK_DEP_LIBS) \
   $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
-libgdk_x11_2_0_la_LDFLAGS = $(LDADD)
+libgdk_directfb_3_0_la_LDFLAGS = $(LDADD)
 
-libgdk_linux_fb_2_0_la_SOURCES = $(common_sources) gdkkeynames.c
-libgdk_linux_fb_2_0_la_LIBADD = linux-fb/libgdk-linux-fb.la $(GDK_DEP_LIBS) \
+libgdk_x11_3_0_la_SOURCES = $(common_sources)
+libgdk_x11_3_0_la_LIBADD = x11/libgdk-x11.la $(GDK_DEP_LIBS) \
   $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
-libgdk_linux_fb_2_0_la_LDFLAGS = $(LDADD)
+libgdk_x11_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) \
+libgdk_quartz_3_0_la_SOURCES = $(common_sources) gdkkeynames.c
+libgdk_quartz_3_0_la_LIBADD = quartz/libgdk-quartz.la $(GDK_DEP_LIBS) \
   $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
-libgdk_win32_2_0_la_DEPENDENCIES = win32/libgdk-win32.la gdk.def
-libgdk_win32_2_0_la_LDFLAGS = -export-symbols gdk.def $(LDADD)
-if HAVE_WINTAB
-libgdk_win32_2_0_la_LIBADD += -Lwin32 -lwntab32x
-endif
-if HAVE_IE55
-libgdk_win32_2_0_la_LIBADD += -Lwin32 -lie55uuid
+libgdk_quartz_3_0_la_LDFLAGS = $(LDADD)
+
+libgdk_win32_3_0_la_SOURCES = $(common_sources) gdkkeynames.c
+libgdk_win32_3_0_la_LIBADD = win32/libgdk-win32.la $(GDK_DEP_LIBS) \
+  $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
+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
+
+introspection_files = \
+               $(gdk_public_h_sources) \
+               $(gdk_c_sources) \
+        gdkenumtypes.c \
+        gdkenumtypes.h \
+        $(srcdir)/x11/*.c
+
+Gdk-3.0.gir: $(gdktargetlib) Makefile
+Gdk_3_0_gir_SCANNERFLAGS = --strip-prefix=Gdk --add-include-path=../gdk-pixbuf
+Gdk_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-3.0 Pango-1.0
+Gdk_3_0_gir_LIBS = $(gdktargetlib)
+Gdk_3_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_files))
+Gdk_3_0_gir_CFLAGS = $(INCLUDES)
+INTROSPECTION_GIRS += Gdk-3.0.gir
+
+girdir = $(datadir)/gir-1.0
+dist_gir_DATA = $(INTROSPECTION_GIRS)
+
+typelibsdir = $(libdir)/girepository-1.0
+typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+
+CLEANFILES += $(dist_gir_DATA) $(typelibs_DATA)
 endif
 
 if OS_WIN32
-install-libtool-import-lib:
-       $(INSTALL) .libs/libgdk-win32-$(GTK_API_VERSION).dll.a $(DESTDIR)$(libdir)
-uninstall-libtool-import-lib:
-       -rm $(DESTDIR)$(libdir)/libgdk-win32-$(GTK_API_VERSION).dll.a
+install-def-file: gdk.def
+       $(INSTALL) $(srcdir)/gdk.def $(DESTDIR)$(libdir)/gdk-win32-3.0.def
+uninstall-def-file:
+       -rm $(DESTDIR)$(libdir)/gdk-win32-3.0.def
 else
-install-libtool-import-lib:
-uninstall-libtool-import-lib:
+install-def-file:
+uninstall-def-file:
 endif
 
 if MS_LIB_AVAILABLE
 noinst_DATA = gdk-win32-$(GTK_API_VERSION).lib
 
 gdk-win32-$(GTK_API_VERSION).lib: libgdk-win32-$(GTK_API_VERSION).la gdk.def
-       lib -name:libgdk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gdk.def -out:$@
+       lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgdk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gdk.def -out:$@
 
 install-ms-lib:
        $(INSTALL) gdk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir)
@@ -179,8 +243,10 @@ install-ms-lib:
 uninstall-ms-lib:
 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') > gdk.def
+       (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
@@ -189,22 +255,22 @@ gdkaliasdef.c: gdk.symbols
         $(PERL) $(srcdir)/makegdkalias.pl -def < $(srcdir)/gdk.symbols > gdkaliasdef.c
 
 if OS_LINUX
-TESTS = abicheck.sh
+TESTS = abicheck.sh pltcheck.sh
 endif
 
 
 lib_LTLIBRARIES = $(gdktargetlib)
 
-EXTRA_LTLIBRARIES = libgdk-x11-2.0.la libgdk-linux-fb-2.0.la libgdk-win32-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 = gdkenumtypes.h stamp-gdkenumtypes.h gdkenumtypes.c \
-  gdkmarshalers.h gdkmarshalers.c
+MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h
+EXTRA_DIST += $(gdk_built_sources)
 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
@@ -219,35 +285,20 @@ if DISABLE_EXPLICIT_DEPS
 endif
 
 #note: not gdkconfig.h
-BUILT_SOURCES =                                        \
-       gdkalias.h                              \
-       gdkaliasdef.c                           \
-       gdkenumtypes.h                          \
-       gdkenumtypes.c                          \
-       gdkmarshalers.h                         \
-       gdkmarshalers.c                         \
+BUILT_SOURCES = \
+       $(gdk_built_sources)                    \
        gdkconfig.h
 
 gdkenumtypes.h: stamp-gdkenumtypes.h
        @true
-stamp-gdkenumtypes.h: @REBUILD@ $(gdk_public_h_sources) Makefile
-       ( cd $(srcdir) && glib-mkenums \
-                       --fhead "#ifndef __GDK_ENUM_TYPES_H__\n#define __GDK_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
-                       --fprod "/* enumerations from \"@filename@\" */\n" \
-                       --vhead "GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define GDK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
-                       --ftail "G_END_DECLS\n\n#endif /* __GDK_ENUM_TYPES_H__ */" \
+stamp-gdkenumtypes.h: @REBUILD@ $(gdk_public_h_sources) gdkenumtypes.h.template
+       ( 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) Makefile
-       ( cd $(srcdir) && glib-mkenums \
-                       --fhead "#define GDK_ENABLE_BROKEN\n#include \"gdk.h\"\n#include \"gdkalias.h\"\n" \
-                       --fprod "\n/* enumerations from \"@filename@\" */" \
-                       --ftail "\n#define __GDK_ENUM_TYPES_C__\n#include \"gdkaliasdef.c\"\n" \
-                       --vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {" \
-                       --vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
-                       --vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
+gdkenumtypes.c: @REBUILD@ $(gdk_public_h_sources) gdkenumtypes.c.template
+       ( cd $(srcdir) && $(GLIB_MKENUMS) --template gdkenumtypes.c.template \
                $(gdk_public_h_sources) ) > xgen-getc \
        && cp xgen-getc gdkenumtypes.c  \
        && rm -f xgen-getc
@@ -256,11 +307,11 @@ gdkenumtypes.c: @REBUILD@ $(gdk_public_h_sources) Makefile
 # Marshaller generation
 #
 gdkmarshalers.h: @REBUILD@ gdkmarshalers.list
-       $(GLIB_GENMARSHAL) --prefix=gdk_marshal $(srcdir)/gdkmarshalers.list --header > gdkmarshalers-h.tmp \
+       $(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
-       (echo "#include \"gdkalias.h\""; $(GLIB_GENMARSHAL) --prefix=gdk_marshal $(srcdir)/gdkmarshalers.list --body) > gdkmarshalers-c.tmp     \
+       (echo "#include \"gdkalias.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 )
 
@@ -271,11 +322,23 @@ 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-libtool-import-lib
+install-data-local: install-ms-lib install-def-file
 
-uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
+uninstall-local: uninstall-ms-lib uninstall-def-file
        rm -f $(DESTDIR)$(configexecincludedir)/gdkconfig.h
 
 # if srcdir!=builddir, clean out maintainer-clean files from builddir
@@ -291,3 +354,5 @@ files:
        @files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
          echo $$p; \
        done
+
+-include $(top_srcdir)/git.mk