From 751299c0a13877c218e908b69557733ba2650af2 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Wed, 1 Feb 2006 23:02:57 +0000
Subject: [PATCH] use pkg-config xscrnsaver in correct Makefile, thx Dawid

---
 src/Makefile        | 13 ++-----------
 src/common/Makefile | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index b47a814ab..4def53941 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,16 +1,7 @@
 # Set the C flags to include the GTK+ and Python libraries
 PYTHONVER = `python -c 'import sys; print sys.version[:3]'`
-HAVE_XSCRNSAVER = $(shell pkg-config --exists xscrnsaver && echo 'YES')
-
-ifeq ($(HAVE_XSCRNSAVER),YES)
-# We link with libXScrnsaver from modular X.Org X11
-CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0 xscrnsaver` -fpic -I/usr/include/python$(PYTHONVER) -I.
-LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0 xscrnsaver`
-else
-# We link with libXScrnsaver from monolithic X.Org X11
-CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` -fpic -I/usr/include/python$(PYTHONVER) -I.
-LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0` -L/usr/X11R6$(LIBDIR) -lX11 -lXss -lXext
-endif
+CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` -fPIC -I/usr/include/python$(PYTHONVER) -I.
+LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0`
 
 all: trayicon.so gtkspell.so
 
diff --git a/src/common/Makefile b/src/common/Makefile
index c527d9b03..c5589be92 100644
--- a/src/common/Makefile
+++ b/src/common/Makefile
@@ -1,12 +1,22 @@
 # Set the C flags to include the GTK+ and Python libraries
 PYTHONVER = `python -c 'import sys; print sys.version[:3]'`
+
+HAVE_XSCRNSAVER = $(shell pkg-config --exists xscrnsaver && echo 'YES')
+
+ifeq ($(HAVE_XSCRNSAVER),YES)
+# We link with libXScrnsaver from modular X.Org X11
+CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0 xscrnsaver` -fpic -I/usr/include/python$(PYTHONVER) -I.
+LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0 xscrnsaver`
+else
+# # We link with libXScrnsaver from monolithic X.Org X11
 CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` -fpic -I/usr/include/python$(PYTHONVER) -I.
-LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0`
+LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0` -L/usr/X11R6$(LIBDIR) -lX11 -lXss -lXext
+# endif
 
 all: idle.so
 
 idle.so:
-	$(CC) $(OPTFLAGS) $(CFLAGS) $(LDFLAGS) -shared idle.c $^ -o $@ -L/usr/X11R6$(LIBDIR) -lX11 -lXss -lXext
+	$(CC) $(OPTFLAGS) $(CFLAGS) $(LDFLAGS) -shared idle.c $^ -o $@
 
 clean:
 	rm -f *.so