From: | "Jeroen Roovers (jer)" <jer@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in x11-wm/musca/files: musca-0.9.24-make.patch |
Date: | Mon, 30 Nov 2009 20:46:41 |
Message-Id: | E1NFD8l-0002l3-GO@stork.gentoo.org |
1 | jer 09/11/30 20:46:35 |
2 | |
3 | Added: musca-0.9.24-make.patch |
4 | Log: |
5 | Fix linking with --as-needed (bug #295165). Make in parallel too. Build xlisten optionally too. |
6 | (Portage version: 2.2_rc54/cvs/Linux i686) |
7 | |
8 | Revision Changes Path |
9 | 1.1 x11-wm/musca/files/musca-0.9.24-make.patch |
10 | |
11 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/musca/files/musca-0.9.24-make.patch?rev=1.1&view=markup |
12 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/musca/files/musca-0.9.24-make.patch?rev=1.1&content-type=text/plain |
13 | |
14 | Index: musca-0.9.24-make.patch |
15 | =================================================================== |
16 | --- musca-0.9.24/Makefile.orig 2009-11-03 03:20:21.000000000 +0100 |
17 | +++ musca-0.9.24/Makefile 2009-11-30 21:39:04.000000000 +0100 |
18 | @@ -1,9 +1,15 @@ |
19 | -CFLAGS?=-Wall -g |
20 | +CFLAGS ?= -Wall -g |
21 | +INCLUDES = $(shell pkg-config --cflags x11) |
22 | +LIBS = $(shell pkg-config --libs x11) -lm |
23 | +COMPILE = $(CC) $(CFLAGS) $(INCLUDES) $(LIBS) $(LDFLAGS) |
24 | +BIN_DIST = musca apis xlisten |
25 | |
26 | -all: |
27 | - $(CC) $(CFLAGS) -I/usr/X11R6/include -L/usr/X11R6/lib -lc -lm -lX11 -o musca musca.c |
28 | - $(CC) $(CFLAGS) -I/usr/X11R6/include -L/usr/X11R6/lib -lc -lm -lX11 -o apis apis.c |
29 | - $(CC) $(CFLAGS) -I/usr/X11R6/include -L/usr/X11R6/lib -lc -lm -lX11 -o xlisten xlisten.c |
30 | +all: $(BIN_DIST) |
31 | + |
32 | +$(BIN_DIST): |
33 | + $(COMPILE) -o $@ $@.c |
34 | |
35 | clean: |
36 | - rm -f musca apis |
37 | + rm -f $(BIN_DIST) |
38 | + |
39 | +.PHONY: all clean |