From 8d49ceca6bf7e33d84c98e0538ca4a8c9f58f887 Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Thu, 23 Jan 2020 20:10:33 +0100
Subject: [PATCH] Complete the flags for building with Gtk+ 3

---
 src/project.conf        | 6 ++++--
 src/widget/project.conf | 8 ++++----
 tools/project.conf      | 4 +++-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/project.conf b/src/project.conf
index b4aa3f2..a91edc2 100644
--- a/src/project.conf
+++ b/src/project.conf
@@ -1,7 +1,7 @@
 targets=camera
-cflags_force=`pkg-config --cflags libDesktop`
+#cflags_force=`pkg-config --cflags libDesktop`
 cflags=-W -Wall -g -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector
-ldflags_force=`pkg-config --libs libDesktop` -lintl
+#ldflags_force=`pkg-config --libs libDesktop` -lintl
 ldflags=-pie -Wl,-z,relro -Wl,-z,now
 dist=Makefile,camera.h,overlay.h,window.h
 
@@ -9,11 +9,13 @@ dist=Makefile,camera.h,overlay.h,window.h
 cflags_force=`pkg-config --cflags libDesktop gtk+-x11-3.0`
 ldflags_force=`pkg-config --libs libDesktop gtk+-x11-3.0` -lintl
 
+#targets
 [camera]
 type=binary
 sources=camera.c,overlay.c,window.c,main.c
 install=$(BINDIR)
 
+#sources
 [camera.c]
 depends=overlay.h,camera.h,../config.h
 
diff --git a/src/widget/project.conf b/src/widget/project.conf
index 3cc23d1..6e0cc1c 100644
--- a/src/widget/project.conf
+++ b/src/widget/project.conf
@@ -1,11 +1,11 @@
 targets=camera
-cflags_force=`pkg-config --cflags libDesktop` -fPIC
+#cflags_force=`pkg-config --cflags libDesktop` -fPIC
 cflags=-W -Wall -g -O2 -D_FORTIFY_SOURCE=2 -fstack-protector
-ldflags_force=`pkg-config --libs libDesktop` -lintl
+#ldflags_force=`pkg-config --libs libDesktop` -lintl
 ldflags=-Wl,-z,relro -Wl,-z,now
 #for Gtk+ 3
-#cflags_force=-W `pkg-config --cflags libDesktop gtk+-x11-3.0`
-#ldflags_force=`pkg-config --libs libDesktop gtk+-x11-3.0` -lintl
+cflags_force=-W `pkg-config --cflags libDesktop gtk+-x11-3.0` -fPIC
+ldflags_force=`pkg-config --libs libDesktop gtk+-x11-3.0` -lintl
 dist=Makefile
 
 [camera]
diff --git a/tools/project.conf b/tools/project.conf
index e56e773..4e44898 100644
--- a/tools/project.conf
+++ b/tools/project.conf
@@ -1,5 +1,5 @@
 targets=gallery
-cflags_force=`pkg-config --cflags gtk+-2.0`
+#cflags_force=`pkg-config --cflags gtk+-2.0`
 cflags=-W -Wall -g -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector
 ldflags_force=`pkg-config --libs glib-2.0`
 ldflags=-pie -Wl,-z,relro -Wl,-z,now
@@ -8,10 +8,12 @@ dist=Makefile
 #for Gtk+ 3
 cflags_force=`pkg-config --cflags gtk+-3.0`
 
+#targets
 [gallery]
 type=binary
 sources=gallery.c
 install=$(BINDIR)
 
+#sources
 [gallery.c]
 depends=../config.h