use pkg-config xscrnsaver in correct Makefile, thx Dawid
This commit is contained in:
parent
1d5c383095
commit
751299c0a1
13
src/Makefile
13
src/Makefile
|
@ -1,16 +1,7 @@
|
||||||
# Set the C flags to include the GTK+ and Python libraries
|
# Set the C flags to include the GTK+ and Python libraries
|
||||||
PYTHONVER = `python -c 'import sys; print sys.version[:3]'`
|
PYTHONVER = `python -c 'import sys; print sys.version[:3]'`
|
||||||
HAVE_XSCRNSAVER = $(shell pkg-config --exists xscrnsaver && echo 'YES')
|
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`
|
||||||
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
|
|
||||||
|
|
||||||
all: trayicon.so gtkspell.so
|
all: trayicon.so gtkspell.so
|
||||||
|
|
||||||
|
|
|
@ -1,12 +1,22 @@
|
||||||
# Set the C flags to include the GTK+ and Python libraries
|
# Set the C flags to include the GTK+ and Python libraries
|
||||||
PYTHONVER = `python -c 'import sys; print sys.version[:3]'`
|
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.
|
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
|
all: idle.so
|
||||||
|
|
||||||
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:
|
clean:
|
||||||
rm -f *.so
|
rm -f *.so
|
||||||
|
|
Loading…
Reference in New Issue