[gtk+] Make the demos build

From: Matthias Clasen <matthiasc src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtk+] Make the demos build
Date: Fri, 7 Oct 2016 14:35:35 +0000 (UTC)
commit b337b405a35b7457850fce5b76a9446c4386d403
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Oct 7 10:11:26 2016 -0400

    Make the demos build

 demos/gtk-demo/Makefile.am                         |   50 ++++++++++----------
 .../data/16x16/gtk3-demo-symbolic.symbolic.png     |  Bin 324 -> 0 bytes
 demos/gtk-demo/data/16x16/gtk3-demo.png            |  Bin 874 -> 0 bytes
 .../data/22x22/gtk3-demo-symbolic.symbolic.png     |  Bin 437 -> 0 bytes
 demos/gtk-demo/data/22x22/gtk3-demo.png            |  Bin 1281 -> 0 bytes
 .../data/24x24/gtk3-demo-symbolic.symbolic.png     |  Bin 465 -> 0 bytes
 demos/gtk-demo/data/24x24/gtk3-demo.png            |  Bin 1374 -> 0 bytes
 .../data/256x256/gtk3-demo-symbolic.symbolic.png   |  Bin 3937 -> 0 bytes
 demos/gtk-demo/data/256x256/gtk3-demo.png          |  Bin 18667 -> 0 bytes
 .../data/32x32/gtk3-demo-symbolic.symbolic.png     |  Bin 581 -> 0 bytes
 demos/gtk-demo/data/32x32/gtk3-demo.png            |  Bin 1748 -> 0 bytes
 .../data/48x48/gtk3-demo-symbolic.symbolic.png     |  Bin 854 -> 0 bytes
 demos/gtk-demo/data/48x48/gtk3-demo.png            |  Bin 2640 -> 0 bytes
 .../data/512x512/gtk3-demo-symbolic.symbolic.png   |  Bin 7594 -> 0 bytes
 demos/gtk-demo/data/512x512/gtk3-demo.png          |  Bin 42374 -> 0 bytes
 demos/gtk-demo/gtk3-demo.desktop                   |   10 ----
 demos/icon-browser/Makefile.am                     |   18 ++++----
 demos/icon-browser/gtk3-icon-browser.desktop       |   10 ----
 demos/widget-factory/Makefile.am                   |   30 ++++++------
 .../gtk3-widget-factory-symbolic.symbolic.png      |  Bin 237 -> 0 bytes
 .../data/16x16/gtk3-widget-factory.png             |  Bin 550 -> 0 bytes
 .../gtk3-widget-factory-symbolic.symbolic.png      |  Bin 332 -> 0 bytes
 .../data/22x22/gtk3-widget-factory.png             |  Bin 685 -> 0 bytes
 .../gtk3-widget-factory-symbolic.symbolic.png      |  Bin 336 -> 0 bytes
 .../data/24x24/gtk3-widget-factory.png             |  Bin 750 -> 0 bytes
 .../gtk3-widget-factory-symbolic.symbolic.png      |  Bin 2950 -> 0 bytes
 .../data/256x256/gtk3-widget-factory.png           |  Bin 10864 -> 0 bytes
 .../gtk3-widget-factory-symbolic.symbolic.png      |  Bin 369 -> 0 bytes
 .../data/32x32/gtk3-widget-factory.png             |  Bin 963 -> 0 bytes
 .../gtk3-widget-factory-symbolic.symbolic.png      |  Bin 495 -> 0 bytes
 .../data/48x48/gtk3-widget-factory.png             |  Bin 1260 -> 0 bytes
 .../data/512x512/gtk3-widget-factory.png           |  Bin 24446 -> 0 bytes
 demos/widget-factory/gtk3-widget-factory.desktop   |   10 ----
 33 files changed, 49 insertions(+), 79 deletions(-)
---
diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
index 8c15e16..a6d4648 100644
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -92,11 +92,11 @@ AM_CPPFLAGS = \
        $(GTK_DEP_CFLAGS)
 
 DEPS = \
-       $(top_builddir)/gtk/libgtk-3.la
+       $(top_builddir)/gtk/libgtk-4.la
 
 LDADDS = \
-       $(top_builddir)/gtk/libgtk-3.la         \
-       $(top_builddir)/gdk/libgdk-3.la         \
+       $(top_builddir)/gtk/libgtk-4.la         \
+       $(top_builddir)/gdk/libgdk-4.la         \
        $(GTK_DEP_LIBS)                         \
        $(GDK_DEP_LIBS)                         \
        -lm
@@ -106,10 +106,10 @@ AM_CPPFLAGS += $(FONTDEMO_CFLAGS)
 LDADDS += $(FONTDEMO_LIBS)
 endif
 
-bin_PROGRAMS = gtk3-demo gtk3-demo-application
+bin_PROGRAMS = gtk4-demo gtk4-demo-application
 
 desktopdir = $(datadir)/applications
-dist_desktop_DATA = gtk3-demo.desktop
+dist_desktop_DATA = gtk4-demo.desktop
 
 BUILT_SOURCES = demos.h demo_resources.c
 
@@ -132,22 +132,22 @@ demos.h: $(demos) geninclude.pl
 demos.h.win32: $(demos_base) geninclude.pl
         $(AM_V_GEN) (here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos_base)) > demos.h.win32
 
-nodist_gtk3_demo_SOURCES = demos.h
+nodist_gtk4_demo_SOURCES = demos.h
 
-gtk3_demo_SOURCES =            \
+gtk4_demo_SOURCES =            \
        $(demos)                \
        demo_resources.c        \
        main.c
 
-gtk3_demo_DEPENDENCIES = $(DEPS)
-gtk3_demo_LDADD = $(LDADDS)
-gtk3_demo_LDFLAGS = -export-dynamic
+gtk4_demo_DEPENDENCIES = $(DEPS)
+gtk4_demo_LDADD = $(LDADDS)
+gtk4_demo_LDFLAGS = -export-dynamic
 
-gtk3_demo_application_SOURCES = \
+gtk4_demo_application_SOURCES = \
        application.c           \
        demo_resources.c
 
-gtk3_demo_application_LDADD = $(LDADDS)
+gtk4_demo_application_LDADD = $(LDADDS)
 
 resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies 
$(builddir)/demo.gresource.xml)
 
@@ -164,12 +164,12 @@ appsicon48dir = $(iconthemedir)/48x48/apps
 appsicon256dir = $(iconthemedir)/256x256/apps
 appsiconscalabledir = $(iconthemedir)/scalable/apps
 
-dist_appsicon16_DATA = data/16x16/gtk3-demo.png data/16x16/gtk3-demo-symbolic.symbolic.png
-dist_appsicon22_DATA = data/22x22/gtk3-demo.png data/22x22/gtk3-demo-symbolic.symbolic.png
-dist_appsicon24_DATA = data/24x24/gtk3-demo.png data/24x24/gtk3-demo-symbolic.symbolic.png
-dist_appsicon32_DATA = data/32x32/gtk3-demo.png data/32x32/gtk3-demo-symbolic.symbolic.png
-dist_appsicon48_DATA = data/48x48/gtk3-demo.png data/48x48/gtk3-demo-symbolic.symbolic.png
-dist_appsicon256_DATA = data/256x256/gtk3-demo.png data/256x256/gtk3-demo-symbolic.symbolic.png
+dist_appsicon16_DATA = data/16x16/gtk4-demo.png data/16x16/gtk4-demo-symbolic.symbolic.png
+dist_appsicon22_DATA = data/22x22/gtk4-demo.png data/22x22/gtk4-demo-symbolic.symbolic.png
+dist_appsicon24_DATA = data/24x24/gtk4-demo.png data/24x24/gtk4-demo-symbolic.symbolic.png
+dist_appsicon32_DATA = data/32x32/gtk4-demo.png data/32x32/gtk4-demo-symbolic.symbolic.png
+dist_appsicon48_DATA = data/48x48/gtk4-demo.png data/48x48/gtk4-demo-symbolic.symbolic.png
+dist_appsicon256_DATA = data/256x256/gtk4-demo.png data/256x256/gtk4-demo-symbolic.symbolic.png
 
 update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force
 
@@ -185,19 +185,19 @@ uninstall-update-icon-cache:
        test -n "$(DESTDIR)" || $(update_icon_cache) "$(iconthemedir)"
 
 # ------------------- MSVC Build Items ----------------
-MSVCPROJS = gtk3-demo gtk3-demo-application
+MSVCPROJS = gtk4-demo gtk4-demo-application
 
-gtk3_demo_FILES = $(gtk3_demo_SOURCES)
-gtk3_demo_EXCLUDES = font_features.c|pagesetup.c
+gtk4_demo_FILES = $(gtk4_demo_SOURCES)
+gtk4_demo_EXCLUDES = font_features.c|pagesetup.c
 
-gtk3_demo_application_FILES = $(gtk3_demo_application_SOURCES)
-gtk3_demo_application_EXCLUDES = dummy
+gtk4_demo_application_FILES = $(gtk4_demo_application_SOURCES)
+gtk4_demo_application_EXCLUDES = dummy
 
 include $(top_srcdir)/build/Makefile.msvcproj
 
 dist-hook: \
-       $(top_builddir)/build/win32/vs9/gtk3-demo.vcproj        \
-       $(top_builddir)/build/win32/vs9/gtk3-demo-application.vcproj
+       $(top_builddir)/build/win32/vs9/gtk4-demo.vcproj        \
+       $(top_builddir)/build/win42/vs9/gtk4-demo-application.vcproj
 
 DISTCLEANFILES = demos.h demos.h.win32
 
diff --git a/demos/icon-browser/Makefile.am b/demos/icon-browser/Makefile.am
index 9b13796..111ce35 100644
--- a/demos/icon-browser/Makefile.am
+++ b/demos/icon-browser/Makefile.am
@@ -6,17 +6,17 @@ AM_CPPFLAGS = \
        $(GTK_DEP_CFLAGS)
 
 LDADD = \
-        $(top_builddir)/gtk/libgtk-3.la \
-        $(top_builddir)/gdk/libgdk-3.la \
+        $(top_builddir)/gtk/libgtk-4.la \
+        $(top_builddir)/gdk/libgdk-4.la \
         $(GTK_DEP_LIBS)
 
 
-bin_PROGRAMS = gtk3-icon-browser
+bin_PROGRAMS = gtk4-icon-browser
 
 desktopdir = $(datadir)/applications
-dist_desktop_DATA = gtk3-icon-browser.desktop
+dist_desktop_DATA = gtk4-icon-browser.desktop
 
-gtk3_icon_browser_SOURCES = \
+gtk4_icon_browser_SOURCES = \
        main.c \
        iconbrowserapp.c iconbrowserapp.h \
        iconbrowserwin.c iconbrowserwin.h \
@@ -36,13 +36,13 @@ EXTRA_DIST = \
        window.ui
 
 # ------------------- MSVC Build Items ----------------
-MSVCPROJS = gtk3-icon-browser
+MSVCPROJS = gtk4-icon-browser
 
-gtk3_icon_browser_FILES = $(gtk3_icon_browser_SOURCES)
-gtk3_icon_browser_EXCLUDES = dummy
+gtk4_icon_browser_FILES = $(gtk4_icon_browser_SOURCES)
+gtk4_icon_browser_EXCLUDES = dummy
 
 include $(top_srcdir)/build/Makefile.msvcproj
 
-dist-hook: $(top_builddir)/build/win32/vs9/gtk3-icon-browser.vcproj
+dist-hook: $(top_builddir)/build/win32/vs9/gtk4-icon-browser.vcproj
 
 -include $(top_srcdir)/git.mk
diff --git a/demos/widget-factory/Makefile.am b/demos/widget-factory/Makefile.am
index a6bfbdc..bc94f9b 100644
--- a/demos/widget-factory/Makefile.am
+++ b/demos/widget-factory/Makefile.am
@@ -1,29 +1,29 @@
 include $(top_srcdir)/Makefile.decl
 
-bin_PROGRAMS = gtk3-widget-factory
+bin_PROGRAMS = gtk4-widget-factory
 
 desktopdir = $(datadir)/applications
-dist_desktop_DATA = gtk3-widget-factory.desktop
+dist_desktop_DATA = gtk4-widget-factory.desktop
 
-gtk3_widget_factory_SOURCES =          \
+gtk4_widget_factory_SOURCES =          \
        widget-factory.c                \
        widget_factory_resources.c
 
 BUILT_SOURCES =                        \
        widget_factory_resources.c
 
-gtk3_widget_factory_DEPENDENCIES =     \
-       $(top_builddir)/gtk/libgtk-3.la
+gtk4_widget_factory_DEPENDENCIES =     \
+       $(top_builddir)/gtk/libgtk-4.la
 
-gtk3_widget_factory_CPPFLAGS =                 \
+gtk4_widget_factory_CPPFLAGS =                 \
        -I$(top_srcdir)                 \
        $(GTK_DEBUG_FLAGS)              \
        $(GTK_DEP_CFLAGS)               \
        $(NULL)
 
-gtk3_widget_factory_LDADD =            \
-       $(top_builddir)/gdk/libgdk-3.la \
-       $(top_builddir)/gtk/libgtk-3.la \
+gtk4_widget_factory_LDADD =            \
+       $(top_builddir)/gdk/libgdk-4.la \
+       $(top_builddir)/gtk/libgtk-4.la \
        $(GTK_DEP_LIBS)                 \
        $(NULL)
 
@@ -40,12 +40,12 @@ appsicon32dir = $(iconthemedir)/32x32/apps
 appsicon48dir = $(iconthemedir)/48x48/apps
 appsicon256dir = $(iconthemedir)/256x256/apps
 
-dist_appsicon16_DATA = data/16x16/gtk3-widget-factory.png 
data/16x16/gtk3-widget-factory-symbolic.symbolic.png
-dist_appsicon22_DATA = data/22x22/gtk3-widget-factory.png 
data/22x22/gtk3-widget-factory-symbolic.symbolic.png
-dist_appsicon24_DATA = data/24x24/gtk3-widget-factory.png 
data/24x24/gtk3-widget-factory-symbolic.symbolic.png
-dist_appsicon32_DATA = data/32x32/gtk3-widget-factory.png 
data/32x32/gtk3-widget-factory-symbolic.symbolic.png
-dist_appsicon48_DATA = data/48x48/gtk3-widget-factory.png 
data/48x48/gtk3-widget-factory-symbolic.symbolic.png
-dist_appsicon256_DATA = data/256x256/gtk3-widget-factory.png 
data/256x256/gtk3-widget-factory-symbolic.symbolic.png
+dist_appsicon16_DATA = data/16x16/gtk4-widget-factory.png 
data/16x16/gtk4-widget-factory-symbolic.symbolic.png
+dist_appsicon22_DATA = data/22x22/gtk4-widget-factory.png 
data/22x22/gtk4-widget-factory-symbolic.symbolic.png
+dist_appsicon24_DATA = data/24x24/gtk4-widget-factory.png 
data/24x24/gtk4-widget-factory-symbolic.symbolic.png
+dist_appsicon32_DATA = data/32x32/gtk4-widget-factory.png 
data/32x32/gtk4-widget-factory-symbolic.symbolic.png
+dist_appsicon48_DATA = data/48x48/gtk4-widget-factory.png 
data/48x48/gtk4-widget-factory-symbolic.symbolic.png
+dist_appsicon256_DATA = data/256x256/gtk4-widget-factory.png 
data/256x256/gtk4-widget-factory-symbolic.symbolic.png
 
 update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]