From 87fa2c0a5d11655a55b57f25ae13b0a5e7d8d476 Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Thu, 28 Sep 2006 20:53:27 +0000 Subject: [PATCH] no need of GTK to build idle.so put LDFLAGS at the end of command (better this way). Fixes #1930 --- src/common/Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/common/Makefile b/src/common/Makefile index c6d05a2d4..21afebc70 100644 --- a/src/common/Makefile +++ b/src/common/Makefile @@ -6,19 +6,18 @@ HAVE_XSCRNSAVER = $(shell pkg-config --exists xscrnsaver && echo 'YES') ifeq ($(HAVE_XSCRNSAVER),YES) # We link with libXScrnsaver from modular X.Org X11 -gtk_and_x_CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0 xscrnsaver` -fpic -I/usr/include/python$(PYTHONVER) -I. -gtk_and_x_LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0 xscrnsaver` -lpython$(PYTHONVER) +x_CFLAGS = `pkg-config --cflags xscrnsaver` -fpic -I/usr/include/python$(PYTHONVER) -I. +x_LDFLAGS = `pkg-config --libs xscrnsaver` -lpython$(PYTHONVER) else # # We link with libXScrnsaver from monolithic X.Org X11 -gtk_and_x_CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` -fpic -I/usr/include/python$(PYTHONVER) -I. -gtk_and_x_LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0` \ - -L/usr/X11R6$(LIBDIR) -lX11 -lXss -lXext -lpython$(PYTHONVER) +x_CFLAGS = -fpic -I/usr/include/python$(PYTHONVER) -I. +x_LDFLAGS = -L/usr/X11R6$(LIBDIR) -lX11 -lXss -lXext -lpython$(PYTHONVER) endif all: idle.so idle.so: - $(CC) $(OPTFLAGS) $(CFLAGS) $(LDFLAGS) $(gtk_and_x_CFLAGS) $(gtk_and_x_LDFLAGS) -shared idle.c $^ -o $@ + $(CC) $(OPTFLAGS) $(CFLAGS) $(x_CFLAGS) -shared idle.c $^ -o $@ $(LDFLAGS) $(x_LDFLAGS) clean: rm -f *.so