From 803ae6a62f894560945f1c1cc7fe3505ca2387b8 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 5 Feb 2019 10:27:57 +0100 Subject: [PATCH] examples: Rename the pkg-config file for GTK 4 We dropped the '+' and the major.minor version from the pkg-config file name. --- examples/README | 4 ++-- examples/application1/Makefile.example | 4 ++-- examples/application10/Makefile.example | 4 ++-- examples/application2/Makefile.example | 4 ++-- examples/application3/Makefile.example | 4 ++-- examples/application4/Makefile.example | 4 ++-- examples/application5/Makefile.example | 4 ++-- examples/application6/Makefile.example | 4 ++-- examples/application7/Makefile.example | 4 ++-- examples/application8/Makefile.example | 4 ++-- examples/application9/Makefile.example | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/examples/README b/examples/README index a12c126043..ab70ec382c 100644 --- a/examples/README +++ b/examples/README @@ -2,10 +2,10 @@ == Building the examples == -The examples in this directory are built alongside the rest of GTK+. +The examples in this directory are built alongside the rest of GTK. The examples under the `application[1-10]` directories are also included in -the GTK+ API reference documentation, and can be built independently, using +the GTK API reference documentation, and can be built independently, using the system libraries, by doing: $ cd application1 diff --git a/examples/application1/Makefile.example b/examples/application1/Makefile.example index 52746a0945..e978edd351 100644 --- a/examples/application1/Makefile.example +++ b/examples/application1/Makefile.example @@ -1,7 +1,7 @@ CC ?= gcc PKGCONFIG = $(shell which pkg-config) -CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0) -LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0) +CFLAGS = $(shell $(PKGCONFIG) --cflags gtk4) +LIBS = $(shell $(PKGCONFIG) --libs gtk4) SRC = main.c exampleapp.c exampleappwin.c diff --git a/examples/application10/Makefile.example b/examples/application10/Makefile.example index 03ddb9a874..4c8396568f 100644 --- a/examples/application10/Makefile.example +++ b/examples/application10/Makefile.example @@ -1,7 +1,7 @@ CC ?= gcc PKGCONFIG = $(shell which pkg-config) -CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0) -LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0) +CFLAGS = $(shell $(PKGCONFIG) --cflags gtk4) +LIBS = $(shell $(PKGCONFIG) --libs gtk4) GLIB_COMPILE_RESOURCES = $(shell $(PKGCONFIG) --variable=glib_compile_resources gio-2.0) GLIB_COMPILE_SCHEMAS = $(shell $(PKGCONFIG) --variable=glib_compile_schemas gio-2.0) diff --git a/examples/application2/Makefile.example b/examples/application2/Makefile.example index c0eb251560..5b81fedf07 100644 --- a/examples/application2/Makefile.example +++ b/examples/application2/Makefile.example @@ -1,7 +1,7 @@ CC ?= gcc PKGCONFIG = $(shell which pkg-config) -CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0) -LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0) +CFLAGS = $(shell $(PKGCONFIG) --cflags gtk4) +LIBS = $(shell $(PKGCONFIG) --libs gtk4) GLIB_COMPILE_RESOURCES = $(shell $(PKGCONFIG) --variable=glib_compile_resources gio-2.0) SRC = exampleapp.c exampleappwin.c main.c diff --git a/examples/application3/Makefile.example b/examples/application3/Makefile.example index c0eb251560..5b81fedf07 100644 --- a/examples/application3/Makefile.example +++ b/examples/application3/Makefile.example @@ -1,7 +1,7 @@ CC ?= gcc PKGCONFIG = $(shell which pkg-config) -CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0) -LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0) +CFLAGS = $(shell $(PKGCONFIG) --cflags gtk4) +LIBS = $(shell $(PKGCONFIG) --libs gtk4) GLIB_COMPILE_RESOURCES = $(shell $(PKGCONFIG) --variable=glib_compile_resources gio-2.0) SRC = exampleapp.c exampleappwin.c main.c diff --git a/examples/application4/Makefile.example b/examples/application4/Makefile.example index 2714a1decb..97af3fca29 100644 --- a/examples/application4/Makefile.example +++ b/examples/application4/Makefile.example @@ -1,7 +1,7 @@ CC ?= gcc PKGCONFIG = $(shell which pkg-config) -CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0) -LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0) +CFLAGS = $(shell $(PKGCONFIG) --cflags gtk4) +LIBS = $(shell $(PKGCONFIG) --libs gtk4) GLIB_COMPILE_RESOURCES = $(shell $(PKGCONFIG) --variable=glib_compile_resources gio-2.0) SRC = exampleapp.c exampleappwin.c main.c diff --git a/examples/application5/Makefile.example b/examples/application5/Makefile.example index b86eef3378..ac7ae85bd3 100644 --- a/examples/application5/Makefile.example +++ b/examples/application5/Makefile.example @@ -1,7 +1,7 @@ CC ?= gcc PKGCONFIG = $(shell which pkg-config) -CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0) -LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0) +CFLAGS = $(shell $(PKGCONFIG) --cflags gtk4) +LIBS = $(shell $(PKGCONFIG) --libs gtk4) GLIB_COMPILE_RESOURCES = $(shell $(PKGCONFIG) --variable=glib_compile_resources gio-2.0) GLIB_COMPILE_SCHEMAS = $(shell $(PKGCONFIG) --variable=glib_compile_schemas gio-2.0) diff --git a/examples/application6/Makefile.example b/examples/application6/Makefile.example index 7c8762ec29..0a8a3db355 100644 --- a/examples/application6/Makefile.example +++ b/examples/application6/Makefile.example @@ -1,7 +1,7 @@ CC ?= gcc PKGCONFIG = $(shell which pkg-config) -CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0) -LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0) +CFLAGS = $(shell $(PKGCONFIG) --cflags gtk4) +LIBS = $(shell $(PKGCONFIG) --libs gtk4) GLIB_COMPILE_RESOURCES = $(shell $(PKGCONFIG) --variable=glib_compile_resources gio-2.0) GLIB_COMPILE_SCHEMAS = $(shell $(PKGCONFIG) --variable=glib_compile_schemas gio-2.0) diff --git a/examples/application7/Makefile.example b/examples/application7/Makefile.example index 03ddb9a874..4c8396568f 100644 --- a/examples/application7/Makefile.example +++ b/examples/application7/Makefile.example @@ -1,7 +1,7 @@ CC ?= gcc PKGCONFIG = $(shell which pkg-config) -CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0) -LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0) +CFLAGS = $(shell $(PKGCONFIG) --cflags gtk4) +LIBS = $(shell $(PKGCONFIG) --libs gtk4) GLIB_COMPILE_RESOURCES = $(shell $(PKGCONFIG) --variable=glib_compile_resources gio-2.0) GLIB_COMPILE_SCHEMAS = $(shell $(PKGCONFIG) --variable=glib_compile_schemas gio-2.0) diff --git a/examples/application8/Makefile.example b/examples/application8/Makefile.example index 03ddb9a874..4c8396568f 100644 --- a/examples/application8/Makefile.example +++ b/examples/application8/Makefile.example @@ -1,7 +1,7 @@ CC ?= gcc PKGCONFIG = $(shell which pkg-config) -CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0) -LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0) +CFLAGS = $(shell $(PKGCONFIG) --cflags gtk4) +LIBS = $(shell $(PKGCONFIG) --libs gtk4) GLIB_COMPILE_RESOURCES = $(shell $(PKGCONFIG) --variable=glib_compile_resources gio-2.0) GLIB_COMPILE_SCHEMAS = $(shell $(PKGCONFIG) --variable=glib_compile_schemas gio-2.0) diff --git a/examples/application9/Makefile.example b/examples/application9/Makefile.example index 03ddb9a874..4c8396568f 100644 --- a/examples/application9/Makefile.example +++ b/examples/application9/Makefile.example @@ -1,7 +1,7 @@ CC ?= gcc PKGCONFIG = $(shell which pkg-config) -CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0) -LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0) +CFLAGS = $(shell $(PKGCONFIG) --cflags gtk4) +LIBS = $(shell $(PKGCONFIG) --libs gtk4) GLIB_COMPILE_RESOURCES = $(shell $(PKGCONFIG) --variable=glib_compile_resources gio-2.0) GLIB_COMPILE_SCHEMAS = $(shell $(PKGCONFIG) --variable=glib_compile_schemas gio-2.0)