[Xfce4-commits] [apps/xfce4-taskmanager] 03/15: set GTK2/GTK3/WNCK/WNCK3 LIBS/CFLAGS depending on USE_GTK3

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

landry pushed a commit to branch landry/gtk3
in repository apps/xfce4-taskmanager.

commit e91f9040d1c4aa116c74b5a75fea52b951ac357b
Author: Landry Breuil <landry at xfce.org>
Date:   Mon Dec 8 22:37:00 2014 +0100

    set GTK2/GTK3/WNCK/WNCK3 LIBS/CFLAGS depending on USE_GTK3
---
 src/Makefile.am |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 952b8e5..7b457ce 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,16 +9,12 @@ bin_PROGRAMS =								\
 	xfce4-taskmanager
 
 xfce4_taskmanager_CFLAGS =						\
-	$(GTK_CFLAGS)							\
 	$(CAIRO_CFLAGS)							\
-	$(WNCK_CFLAGS)							\
 	$(GKSU_CFLAGS)							\
 	$(NULL)
 
 xfce4_taskmanager_LDADD = 						\
-	$(GTK_LIBS)							\
 	$(CAIRO_LIBS)							\
-	$(WNCK_LIBS)							\
 	$(GKSU_LIBS)							\
 	$(NULL)
 
@@ -38,6 +34,14 @@ xfce4_taskmanager_SOURCES =						\
 	task-manager.c			task-manager.h			\
 	$(NULL)
 
+if USE_GTK3
+xfce4_taskmanager_LDADD +=	$(GTK3_LIBS) $(WNCK3_LIBS)
+xfce4_taskmanager_CFLAGS +=	$(GTK3_CFLAGS) $(WNCK3_CFLAGS)
+else
+xfce4_taskmanager_LDADD +=	$(GTK_LIBS) $(WNCK_LIBS)
+xfce4_taskmanager_CFLAGS +=	$(GTK_CFLAGS) $(WNCK_CFLAGS)
+endif
+
 if HAVE_WNCK
 xfce4_taskmanager_SOURCES += app-manager.c app-manager.h
 endif

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.