GNOME.org
 

[gtk+/wip/gtk4: 3/9] Rename Makefile references from 3.0 to 4.0

commit e325740169b5aa4ad35a8b4fb8bd0933871e1022
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Oct 5 15:38:34 2016 -0400

    Rename Makefile references from 3.0 to 4.0
    
    This is almost certainly incomplete.
    Needs careful scrutiny

 gdk/Makefile.am          |   98 +++++++++++++++++++++++-----------------------
 gdk/broadway/Makefile.am |    4 +-
 gdk/mir/Makefile.am      |    4 +-
 gdk/quartz/Makefile.am   |    4 +-
 gdk/wayland/Makefile.am  |    4 +-
 gdk/win32/Makefile.am    |    4 +-
 gdk/x11/Makefile.am      |    4 +-
 gtk/Makefile.am          |   46 +++++++++++-----------
 8 files changed, 84 insertions(+), 84 deletions(-)
---
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 052d487..807a401 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -190,11 +190,11 @@ gdk_built_sources =                               \
 # setup GDK sources and their dependencies
 #
 
-gdkincludedir = $(includedir)/gtk-3.0/gdk
+gdkincludedir = $(includedir)/gtk-4.0/gdk
 gdkinclude_HEADERS = $(gdk_public_h_sources)
 nodist_gdkinclude_HEADERS = gdkconfig.h gdkenumtypes.h gdkversionmacros.h
 
-deprecatedincludedir = $(includedir)/gtk-3.0/gdk/deprecated
+deprecatedincludedir = $(includedir)/gtk-4.0/gdk/deprecated
 deprecatedinclude_HEADERS = $(deprecated_h_sources)
 
 common_sources =               \
@@ -246,17 +246,17 @@ introspection_files =             \
         gdkenumtypes.c         \
         gdkenumtypes.h
 
-Gdk-3.0.gir: libgdk-3.la Makefile
-Gdk_3_0_gir_SCANNERFLAGS =     \
+Gdk-4.0.gir: libgdk-3.la Makefile
+Gdk_4_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.la
-Gdk_3_0_gir_FILES = $(introspection_files)
-Gdk_3_0_gir_CFLAGS = $(AM_CPPFLAGS)
-Gdk_3_0_gir_EXPORT_PACKAGES = gdk-3.0
-INTROSPECTION_GIRS += Gdk-3.0.gir
+Gdk_4_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 cairo-1.0
+Gdk_4_0_gir_LIBS = libgdk-3.la
+Gdk_4_0_gir_FILES = $(introspection_files)
+Gdk_4_0_gir_CFLAGS = $(AM_CPPFLAGS)
+Gdk_4_0_gir_EXPORT_PACKAGES = gdk-4.0
+INTROSPECTION_GIRS += Gdk-4.0.gir
 if OS_WIN32
-Gdk_3_0_gir_CFLAGS += -I$(srcdir)/win32 -I$(srcdir)
+Gdk_4_0_gir_CFLAGS += -I$(srcdir)/win32 -I$(srcdir)
 endif
 if USE_X11
 x11_introspection_files =              \
@@ -306,17 +306,17 @@ x11_introspection_files =                 \
        x11/gdkx11visual.h              \
        x11/gdkx11window.h
 
-GdkX11-3.0.gir: libgdk-3.la Gdk-3.0.gir Makefile
-GdkX11_3_0_gir_SCANNERFLAGS =          \
+GdkX11-4.0.gir: libgdk-3.la Gdk-4.0.gir Makefile
+GdkX11_4_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 = $(AM_CPPFLAGS) -L$(top_builddir)/gdk
-GdkX11_3_0_gir_EXPORT_PACKAGES = gdk-x11-3.0
-INTROSPECTION_GIRS += GdkX11-3.0.gir
+       --include-uninstalled=$(top_builddir)/gdk/Gdk-4.0.gir
+GdkX11_4_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 xlib-2.0
+GdkX11_4_0_gir_LIBS = libgdk-3.la
+GdkX11_4_0_gir_FILES = $(x11_introspection_files)
+GdkX11_4_0_gir_CFLAGS = $(AM_CPPFLAGS) -L$(top_builddir)/gdk
+GdkX11_4_0_gir_EXPORT_PACKAGES = gdk-x11-4.0
+INTROSPECTION_GIRS += GdkX11-4.0.gir
 
 endif # USE_X11
 
@@ -351,16 +351,16 @@ w32_introspection_files =         \
        win32/gdkwindow-win32.c
 
 if OS_WIN32
-GdkWin32-3.0.gir: libgdk-3.la Gdk-3.0.gir Makefile
-GdkWin32_3_0_gir_SCANNERFLAGS = \
+GdkWin32-4.0.gir: libgdk-3.la Gdk-4.0.gir Makefile
+GdkWin32_4_0_gir_SCANNERFLAGS = \
        --identifier-prefix=Gdk         \
        --c-include="gdk/gdkwin32.h"    \
-       --include-uninstalled=$(top_builddir)/gdk/Gdk-3.0.gir
-GdkWin32_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0
-GdkWin32_3_0_gir_LIBS = libgdk-3.la
-GdkWin32_3_0_gir_FILES = $(w32_introspection_files)
-GdkWin32_3_0_gir_CFLAGS = $(AM_CPPFLAGS) -L$(top_builddir)/gdk -I$(srcdir)/win32 -I$(srcdir)
-INTROSPECTION_GIRS += GdkWin32-3.0.gir
+       --include-uninstalled=$(top_builddir)/gdk/Gdk-4.0.gir
+GdkWin32_4_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0
+GdkWin32_4_0_gir_LIBS = libgdk-3.la
+GdkWin32_4_0_gir_FILES = $(w32_introspection_files)
+GdkWin32_4_0_gir_CFLAGS = $(AM_CPPFLAGS) -L$(top_builddir)/gdk -I$(srcdir)/win32 -I$(srcdir)
+INTROSPECTION_GIRS += GdkWin32-4.0.gir
 
 endif # OS_WIN32
 
@@ -381,9 +381,9 @@ gdk.def: libgdk-3.la
        objdump -p .libs/libgdk-$(GTK_MAJOR_VERSION)-@LT_CURRENT_MINUS_AGE@.dll | sed -n -e 
's/\t\[\s\+\([0-9]\+\)\]\s\([A-Za-z_][A-Za-z0-9_]\)/\2/p' >>$@
 install-def-file: gdk.def
        mkdir -p $(DESTDIR)$(libdir)
-       $(INSTALL) gdk.def $(DESTDIR)$(libdir)/gdk-win32-3.0.def
+       $(INSTALL) gdk.def $(DESTDIR)$(libdir)/gdk-win32-4.0.def
 uninstall-def-file:
-       -rm $(DESTDIR)$(libdir)/gdk-win32-3.0.def
+       -rm $(DESTDIR)$(libdir)/gdk-win32-4.0.def
 else
 install-def-file:
 uninstall-def-file:
@@ -512,33 +512,33 @@ include $(top_srcdir)/build/Makefile.msvcproj
 
 if HAVE_INTROSPECTION
 # Introspection Items for MSVC
-MSVC_INTROSPECT_GIRS = Gdk-3.0.gir GdkWin32-3.0.gir
+MSVC_INTROSPECT_GIRS = Gdk-4.0.gir GdkWin32-4.0.gir
 
 BASE_MSVC_GIR_CFLAGS =                 \
        $(GDK_CFLAGS_DEFINES)           \
        -I../.. -I../../gdk -I.../../gdk/win32
 
 INTROSPECTION_INTERMEDIATE_ITEMS = \
-       $(top_builddir)/build/win32/Gdk-3.0.gir.msvc.introspect \
-       $(top_builddir)/build/win32/Gdk_3_0_gir_list                    \
-       $(top_builddir)/build/win32/GdkWin32-3.0.gir.msvc.introspect    \
-       $(top_builddir)/build/win32/GdkWin32_3_0_gir_list
-
-Gdk_3_0_gir_MSVC_FILES = $(introspection_files)
-Gdk_3_0_gir_MSVC_EXPORT_PACKAGES = $(Gdk_3_0_gir_EXPORT_PACKAGES)
-Gdk_3_0_gir_MSVC_INCLUDE_GIRS = $(Gdk_3_0_gir_INCLUDES)
-Gdk_3_0_gir_MSVC_LIBS = gdk-3.0
-Gdk_3_0_gir_MSVC_CFLAGS = $(BASE_MSVC_GIR_CFLAGS)
-Gdk_3_0_gir_MSVC_SCANNERFLAGS = $(Gdk_3_0_gir_SCANNERFLAGS)
-
-GdkWin32_3_0_gir_MSVC_FILES = $(w32_introspection_files)
-GdkWin32_3_0_gir_MSVC_INCLUDE_GIRS = $(GdkWin32_3_0_gir_INCLUDES)
-GdkWin32_3_0_gir_MSVC_LIBS = $(Gdk_3_0_gir_MSVC_LIBS)
-GdkWin32_3_0_gir_MSVC_CFLAGS = $(BASE_MSVC_GIR_CFLAGS)
-GdkWin32_3_0_gir_MSVC_SCANNERFLAGS =   \
+       $(top_builddir)/build/win32/Gdk-4.0.gir.msvc.introspect \
+       $(top_builddir)/build/win32/Gdk_4_0_gir_list                    \
+       $(top_builddir)/build/win32/GdkWin32-4.0.gir.msvc.introspect    \
+       $(top_builddir)/build/win32/GdkWin32_4_0_gir_list
+
+Gdk_4_0_gir_MSVC_FILES = $(introspection_files)
+Gdk_4_0_gir_MSVC_EXPORT_PACKAGES = $(Gdk_4_0_gir_EXPORT_PACKAGES)
+Gdk_4_0_gir_MSVC_INCLUDE_GIRS = $(Gdk_4_0_gir_INCLUDES)
+Gdk_4_0_gir_MSVC_LIBS = gdk-4.0
+Gdk_4_0_gir_MSVC_CFLAGS = $(BASE_MSVC_GIR_CFLAGS)
+Gdk_4_0_gir_MSVC_SCANNERFLAGS = $(Gdk_4_0_gir_SCANNERFLAGS)
+
+GdkWin32_4_0_gir_MSVC_FILES = $(w32_introspection_files)
+GdkWin32_4_0_gir_MSVC_INCLUDE_GIRS = $(GdkWin32_4_0_gir_INCLUDES)
+GdkWin32_4_0_gir_MSVC_LIBS = $(Gdk_4_0_gir_MSVC_LIBS)
+GdkWin32_4_0_gir_MSVC_CFLAGS = $(BASE_MSVC_GIR_CFLAGS)
+GdkWin32_4_0_gir_MSVC_SCANNERFLAGS =   \
        --identifier-prefix=Gdk         \
        --c-include="gdk/gdkwin32.h"    \
-       --include-uninstalled=./Gdk-3.0.gir
+       --include-uninstalled=./Gdk-4.0.gir
 
 include $(top_srcdir)/build/Makefile.msvc-introspection
 
diff --git a/gdk/broadway/Makefile.am b/gdk/broadway/Makefile.am
index f1c3923..ff793a7 100644
--- a/gdk/broadway/Makefile.am
+++ b/gdk/broadway/Makefile.am
@@ -2,8 +2,8 @@
 include $(top_srcdir)/Makefile.decl
 NULL =
 
-libgdkincludedir = $(includedir)/gtk-3.0/gdk
-libgdkbroadwayincludedir = $(includedir)/gtk-3.0/gdk/broadway
+libgdkincludedir = $(includedir)/gtk-4.0/gdk
+libgdkbroadwayincludedir = $(includedir)/gtk-4.0/gdk/broadway
 
 AM_CPPFLAGS =                          \
        -DG_LOG_DOMAIN=\"Gdk\"          \
diff --git a/gdk/mir/Makefile.am b/gdk/mir/Makefile.am
index 71b6e37..654b8f9 100644
--- a/gdk/mir/Makefile.am
+++ b/gdk/mir/Makefile.am
@@ -1,8 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 include $(top_srcdir)/Makefile.decl
 
-libgdkincludedir = $(includedir)/gtk-3.0/gdk
-libgdkmirincludedir = $(includedir)/gtk-3.0/gdk/mir
+libgdkincludedir = $(includedir)/gtk-4.0/gdk
+libgdkmirincludedir = $(includedir)/gtk-4.0/gdk/mir
 
 AM_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"Gdk\" \
diff --git a/gdk/quartz/Makefile.am b/gdk/quartz/Makefile.am
index 18fdbd3..9bd34ef 100644
--- a/gdk/quartz/Makefile.am
+++ b/gdk/quartz/Makefile.am
@@ -1,7 +1,7 @@
 include $(top_srcdir)/Makefile.decl
 
-libgdkincludedir = $(includedir)/gtk-3.0/gdk
-libgdkquartzincludedir = $(includedir)/gtk-3.0/gdk/quartz
+libgdkincludedir = $(includedir)/gtk-4.0/gdk
+libgdkquartzincludedir = $(includedir)/gtk-4.0/gdk/quartz
 
 AM_CPPFLAGS =                          \
        -DG_LOG_DOMAIN=\"Gdk\"          \
diff --git a/gdk/wayland/Makefile.am b/gdk/wayland/Makefile.am
index 5b2e64e..127e091 100644
--- a/gdk/wayland/Makefile.am
+++ b/gdk/wayland/Makefile.am
@@ -1,8 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 include $(top_srcdir)/Makefile.decl
 
-libgdkincludedir = $(includedir)/gtk-3.0/gdk
-libgdkwaylandincludedir = $(includedir)/gtk-3.0/gdk/wayland
+libgdkincludedir = $(includedir)/gtk-4.0/gdk
+libgdkwaylandincludedir = $(includedir)/gtk-4.0/gdk/wayland
 
 AM_CPPFLAGS =                                  \
        -DG_LOG_DOMAIN=\"Gdk\"                  \
diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am
index 991bf70..8d73e22 100644
--- a/gdk/win32/Makefile.am
+++ b/gdk/win32/Makefile.am
@@ -1,8 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 include $(top_srcdir)/Makefile.decl
 
-libgdkincludedir = $(includedir)/gtk-3.0/gdk
-libgdkwin32includedir = $(includedir)/gtk-3.0/gdk/win32
+libgdkincludedir = $(includedir)/gtk-4.0/gdk
+libgdkwin32includedir = $(includedir)/gtk-4.0/gdk/win32
 
 AM_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"Gdk\"          \
diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
index 6289f3a..c233520 100644
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@@ -1,8 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 include $(top_srcdir)/Makefile.decl
 
-libgdkincludedir = $(includedir)/gtk-3.0/gdk
-libgdkx11includedir = $(includedir)/gtk-3.0/gdk/x11
+libgdkincludedir = $(includedir)/gtk-4.0/gdk
+libgdkx11includedir = $(includedir)/gtk-4.0/gdk/x11
 
 AM_CPPFLAGS =                          \
        -DG_LOG_DOMAIN=\"Gdk\"          \
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 3b76b82..c9261da 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1081,7 +1081,7 @@ gtk_use_quartz_private_h_sources =        \
        gtkquartz.h
 if USE_QUARTZ
 gtk_c_sources += $(gtk_use_quartz_c_sources)
-libgtk_3_la_CFLAGS = "-xobjective-c"
+libgtk_4_la_CFLAGS = "-xobjective-c"
 gtk_private_h_sources += $(gtk_use_quartz_private_h_sources)
 endif
 
@@ -1392,41 +1392,41 @@ gtktestutils.c: gtktypefuncs.c
 # target platform:
 lib_LTLIBRARIES = libgtk-3.la
 
-gtkincludedir = $(includedir)/gtk-3.0/gtk
+gtkincludedir = $(includedir)/gtk-4.0/gtk
 gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_semi_private_h_sources) $(gtk_built_public_sources) 
gtkversion.h
 
-a11yincludedir = $(includedir)/gtk-3.0/gtk/a11y
+a11yincludedir = $(includedir)/gtk-4.0/gtk/a11y
 a11yinclude_HEADERS= $(a11y_h_sources)
 
-deprecatedincludedir = $(includedir)/gtk-3.0/gtk/deprecated
+deprecatedincludedir = $(includedir)/gtk-4.0/gtk/deprecated
 deprecatedinclude_HEADERS= $(deprecated_h_sources)
 
-gtkunixprintincludedir = $(includedir)/gtk-3.0/unix-print/gtk
+gtkunixprintincludedir = $(includedir)/gtk-4.0/unix-print/gtk
 gtkunixprintinclude_HEADERS = $(gtk_unix_print_public_h_sources)
 
-nodist_libgtk_3_la_SOURCES = $(nodist_gtk_c_sources)
-libgtk_3_la_SOURCES = $(gtk_c_sources)
-libgtk_3_la_LDFLAGS = $(libtool_opts)
-libgtk_3_la_LIBADD = $(libadd)
-libgtk_3_la_DEPENDENCIES = $(deps)
+nodist_libgtk_4_la_SOURCES = $(nodist_gtk_c_sources)
+libgtk_4_la_SOURCES = $(gtk_c_sources)
+libgtk_4_la_LDFLAGS = $(libtool_opts)
+libgtk_4_la_LIBADD = $(libadd)
+libgtk_4_la_DEPENDENCIES = $(deps)
 
 if USE_WIN32
-libgtk_3_la_LIBADD += -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
-libgtk_3_la_LDFLAGS += -Wl,-luuid $(gtk_win32_res_ldflag)
-libgtk_3_la_DEPENDENCIES += $(gtk_win32_res)
+libgtk_4_la_LIBADD += -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
+libgtk_4_la_LDFLAGS += -Wl,-luuid $(gtk_win32_res_ldflag)
+libgtk_4_la_DEPENDENCIES += $(gtk_win32_res)
 endif
 
 install-exec-hook:
 if DISABLE_EXPLICIT_DEPS
-       $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgtk-3.la
+       $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgtk-4.la
 endif
 
 if USE_QUARTZ
 install-mac-key-theme:
-       $(MKDIR_P) $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0
-       $(INSTALL_DATA) $(srcdir)/gtk-keys.css.mac $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0/gtk-keys.css
+       $(MKDIR_P) $(DESTDIR)$(datadir)/themes/Mac/gtk-4.0
+       $(INSTALL_DATA) $(srcdir)/gtk-keys.css.mac $(DESTDIR)$(datadir)/themes/Mac/gtk-4.0/gtk-keys.css
 uninstall-mac-key-theme:
-       rm -f $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0/gtk-keys.css
+       rm -f $(DESTDIR)$(datadir)/themes/Mac/gtk-4.0/gtk-keys.css
 else
 install-mac-key-theme:
 uninstall-mac-key-theme:
@@ -1510,14 +1510,14 @@ dist-hook: \
 
 # Install a RC file for the default GTK+ theme, and key themes
 install-data-local: install-ms-lib install-def-file install-mac-key-theme
-       $(MKDIR_P) $(DESTDIR)$(datadir)/themes/Default/gtk-3.0
-       $(INSTALL_DATA) $(srcdir)/gtk-keys.css.default 
$(DESTDIR)$(datadir)/themes/Default/gtk-3.0/gtk-keys.css
-       $(MKDIR_P) $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0
-       $(INSTALL_DATA) $(srcdir)/gtk-keys.css.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0/gtk-keys.css
+       $(MKDIR_P) $(DESTDIR)$(datadir)/themes/Default/gtk-4.0
+       $(INSTALL_DATA) $(srcdir)/gtk-keys.css.default 
$(DESTDIR)$(datadir)/themes/Default/gtk-4.0/gtk-keys.css
+       $(MKDIR_P) $(DESTDIR)$(datadir)/themes/Emacs/gtk-4.0
+       $(INSTALL_DATA) $(srcdir)/gtk-keys.css.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-4.0/gtk-keys.css
 
 uninstall-local: uninstall-ms-lib uninstall-def-file uninstall-mac-key-theme
-       rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-3.0/gtk-keys.css
-       rm -f $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0/gtk-keys.css
+       rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-4.0/gtk-keys.css
+       rm -f $(DESTDIR)$(datadir)/themes/Emacs/gtk-4.0/gtk-keys.css
 
 # if srcdir!=builddir, clean out maintainer-clean files from builddir
 # this allows dist to pass.
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]