Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-sound/qtscrobbler/files: qtscrobbler-0.10-Makefile.patch
Date: Sun, 31 Oct 2010 11:33:36
Message-Id: 20101031113329.48EED2003C@flycatcher.gentoo.org
1 ssuominen 10/10/31 11:33:29
2
3 Added: qtscrobbler-0.10-Makefile.patch
4 Log:
5 Version bump.
6
7 (Portage version: 2.2.0_alpha1/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 media-sound/qtscrobbler/files/qtscrobbler-0.10-Makefile.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/qtscrobbler/files/qtscrobbler-0.10-Makefile.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/qtscrobbler/files/qtscrobbler-0.10-Makefile.patch?rev=1.1&content-type=text/plain
14
15 Index: qtscrobbler-0.10-Makefile.patch
16 ===================================================================
17 --- src/cli/Makefile
18 +++ src/cli/Makefile
19 @@ -1,4 +1,4 @@
20 -CC = g++
21 +CXX ?= g++
22 mingw = false
23 WINDRES =
24 RES =
25 @@ -27,7 +27,7 @@
26 LINKOBJ = scrobble-cli.o libscrobble.o md5.o ConvertUTF.o mtp.o $(RES)
27 endif
28
29 -CFLAGS = -Wall -O2 -g $(INCLUDE) $(CURL_FLAGS) $(MTP_FLAGS)
30 +CXXFLAGS += -Wall $(INCLUDE) $(CURL_FLAGS) $(MTP_FLAGS)
31
32 .PHONY: all all-before all-after clean clean-custom
33
34 @@ -37,22 +37,22 @@
35 rm -f *.o *~ *.d $(BIN) $(BIN).exe
36
37 $(BIN): $(OBJ)
38 - $(CC) $(LINKOBJ) -o $(BIN) $(LIBS)
39 + $(CXX) $(LDFLAGS) $(LINKOBJ) -o $(BIN) $(LIBS)
40
41 scrobble-cli.o: scrobble-cli.cpp
42 - $(CC) -c scrobble-cli.cpp -o scrobble-cli.o $(CFLAGS)
43 + $(CXX) -c scrobble-cli.cpp -o scrobble-cli.o $(CXXFLAGS)
44
45 libscrobble.o: ../lib/libscrobble.cpp
46 - $(CC) -c ../lib/libscrobble.cpp -o libscrobble.o $(CFLAGS)
47 + $(CXX) -c ../lib/libscrobble.cpp -o libscrobble.o $(CXXFLAGS)
48
49 md5.o: ../lib/md5.c
50 - $(CC) -c ../lib/md5.c -o md5.o $(CFLAGS)
51 + $(CXX) -c ../lib/md5.c -o md5.o $(CXXFLAGS)
52
53 ConvertUTF.o: ../lib/ConvertUTF.c
54 - $(CC) -c ../lib/ConvertUTF.c -o ConvertUTF.o $(CFLAGS)
55 + $(CXX) -c ../lib/ConvertUTF.c -o ConvertUTF.o $(CXXFLAGS)
56
57 mtp.o: ../lib/mtp-libmtp.cpp
58 - $(CC) -c ../lib/mtp-libmtp.cpp -o mtp.o $(CFLAGS)
59 + $(CXX) -c ../lib/mtp-libmtp.cpp -o mtp.o $(CXXFLAGS)
60
61 install:
62 install -D -m 755 scrobble-cli -p $(DESTDIR)$(bindir)/scrobble-cli