[gtk+] Make certain gtk3 types conditional (GST-style)
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Make certain gtk3 types conditional (GST-style)
- Date: Thu, 17 May 2012 04:05:30 +0000 (UTC)
commit 5eb286b74421178219221f3cbfc0bdb546adaecd
Author: ÐÑÑÐÐÐ ÐÐÐÑÐÐÑÐÐ <lrn1986 gmail com>
Date: Sat May 12 20:37:56 2012 +0400
Make certain gtk3 types conditional (GST-style)
https://bugzilla.gnome.org/show_bug.cgi?id=675895
configure.ac | 5 +++++
docs/reference/gtk/Makefile.am | 2 +-
docs/reference/gtk/{gtk3.types => gtk3.types.in} | 12 ++++++------
3 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c801dd2..34fc687 100644
--- a/configure.ac
+++ b/configure.ac
@@ -140,8 +140,11 @@ MATH_LIB=-lm
AC_MSG_CHECKING([for native Win32])
LIB_EXE_MACHINE_FLAG=X86
EXE_MANIFEST_ARCHITECTURE=X86
+DISABLE_ON_W32=''
case "$host" in
*-*-mingw*)
+ dnl Comment-out certain gtk3.types.in lines
+ DISABLE_ON_W32='%'
os_win32=yes
gio_can_sniff=no
MATH_LIB=
@@ -158,6 +161,7 @@ case "$host" in
esac
AC_MSG_RESULT([$os_win32])
+AC_SUBST(DISABLE_ON_W32)
AC_SUBST(LIB_EXE_MACHINE_FLAG)
AC_SUBST(EXE_MANIFEST_ARCHITECTURE)
@@ -1714,6 +1718,7 @@ docs/reference/Makefile
docs/reference/gdk/Makefile
docs/reference/gdk/version.xml
docs/reference/gtk/Makefile
+docs/reference/gtk/gtk3.types
docs/reference/gtk/version.xml
docs/reference/libgail-util/Makefile
docs/reference/libgail-util/version.xml
diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index 47bc96d..6f0c872 100644
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -390,7 +390,7 @@ FIXXREF_OPTIONS=--extra-dir=../gdk/html \
include $(top_srcdir)/gtk-doc.make
# Other files to distribute
-EXTRA_DIST += version.xml.in
+EXTRA_DIST += version.xml.in gtk3.types.in
########################################################################
diff --git a/docs/reference/gtk/gtk3.types b/docs/reference/gtk/gtk3.types.in
similarity index 95%
rename from docs/reference/gtk/gtk3.types
rename to docs/reference/gtk/gtk3.types.in
index c67ac72..c056794 100644
--- a/docs/reference/gtk/gtk3.types
+++ b/docs/reference/gtk/gtk3.types.in
@@ -115,17 +115,17 @@ gtk_offscreen_window_get_type
gtk_orientable_get_type
gtk_overlay_get_type
gtk_page_setup_get_type
-gtk_page_setup_unix_dialog_get_type
+ DISABLE_ON_W32@gtk_page_setup_unix_dialog_get_type
gtk_paned_get_type
gtk_paper_size_get_type
-gtk_plug_get_type
-gtk_printer_get_type
+ DISABLE_ON_W32@gtk_plug_get_type
+ DISABLE_ON_W32@gtk_printer_get_type
gtk_print_context_get_type
-gtk_print_job_get_type
+ DISABLE_ON_W32@gtk_print_job_get_type
gtk_print_operation_get_type
gtk_print_operation_preview_get_type
gtk_print_settings_get_type
-gtk_print_unix_dialog_get_type
+ DISABLE_ON_W32@gtk_print_unix_dialog_get_type
gtk_progress_bar_get_type
gtk_radio_action_get_type
gtk_radio_button_get_type
@@ -149,7 +149,7 @@ gtk_separator_menu_item_get_type
gtk_separator_tool_item_get_type
gtk_settings_get_type
gtk_size_group_get_type
-gtk_socket_get_type
+ DISABLE_ON_W32@gtk_socket_get_type
gtk_spin_button_get_type
gtk_spinner_get_type
gtk_statusbar_get_type
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]