From: Mohammed Sadiq Date: Mon, 7 May 2018 16:32:10 +0000 (+0530) Subject: examples: Fix Makefiles to use gtk4 for build X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~22^2~298 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c5976fed9a570ee9b3e39d873f609fa200334eb6;p=gtk4.git examples: Fix Makefiles to use gtk4 for build --- diff --git a/examples/application1/Makefile.example b/examples/application1/Makefile.example index 47d2ae9353..52746a0945 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+-3.0) -LIBS = $(shell $(PKGCONFIG) --libs gtk+-3.0) +CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0) +LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0) SRC = main.c exampleapp.c exampleappwin.c diff --git a/examples/application10/Makefile.example b/examples/application10/Makefile.example index 306da637e6..03ddb9a874 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+-3.0) -LIBS = $(shell $(PKGCONFIG) --libs gtk+-3.0) +CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0) +LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0) 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 844fffdc17..c0eb251560 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+-3.0) -LIBS = $(shell $(PKGCONFIG) --libs gtk+-3.0) +CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0) +LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0) 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 844fffdc17..c0eb251560 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+-3.0) -LIBS = $(shell $(PKGCONFIG) --libs gtk+-3.0) +CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0) +LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0) 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 cc560535ac..2714a1decb 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+-3.0) -LIBS = $(shell $(PKGCONFIG) --libs gtk+-3.0) +CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0) +LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0) 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 d056de216f..b86eef3378 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+-3.0) -LIBS = $(shell $(PKGCONFIG) --libs gtk+-3.0) +CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0) +LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0) 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 9ae9ad511a..7c8762ec29 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+-3.0) -LIBS = $(shell $(PKGCONFIG) --libs gtk+-3.0) +CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0) +LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0) 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 306da637e6..03ddb9a874 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+-3.0) -LIBS = $(shell $(PKGCONFIG) --libs gtk+-3.0) +CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0) +LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0) 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 306da637e6..03ddb9a874 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+-3.0) -LIBS = $(shell $(PKGCONFIG) --libs gtk+-3.0) +CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0) +LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0) 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 306da637e6..03ddb9a874 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+-3.0) -LIBS = $(shell $(PKGCONFIG) --libs gtk+-3.0) +CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0) +LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0) GLIB_COMPILE_RESOURCES = $(shell $(PKGCONFIG) --variable=glib_compile_resources gio-2.0) GLIB_COMPILE_SCHEMAS = $(shell $(PKGCONFIG) --variable=glib_compile_schemas gio-2.0)