1 |
grozin 10/12/03 14:51:19 |
2 |
|
3 |
Added: fotoxx-10.12-makefile.patch |
4 |
Removed: fotoxx-10.10.2-makefile.patch |
5 |
Log: |
6 |
Version bump |
7 |
|
8 |
(Portage version: 2.2.0_alpha6/cvs/Linux i686) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 media-gfx/fotoxx/files/fotoxx-10.12-makefile.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/fotoxx/files/fotoxx-10.12-makefile.patch?rev=1.1&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/fotoxx/files/fotoxx-10.12-makefile.patch?rev=1.1&content-type=text/plain |
15 |
|
16 |
Index: fotoxx-10.12-makefile.patch |
17 |
=================================================================== |
18 |
Index: fotoxx-10.11.2/Makefile |
19 |
=================================================================== |
20 |
--- fotoxx-10.11.2.orig/Makefile |
21 |
+++ fotoxx-10.11.2/Makefile |
22 |
@@ -5,30 +5,30 @@ VERSION = 10.11.2 |
23 |
SOURCE = $(PROGRAM)-$(VERSION).cc |
24 |
|
25 |
# defaults for parameters that may be pre-defined |
26 |
-CXXFLAGS ?= -O3 -g -Wall |
27 |
-LDFLAGS ?= -O3 -g -Wall -rdynamic |
28 |
+CXXFLAGS += -Wall |
29 |
+LDFLAGS += -rdynamic |
30 |
PREFIX ?= /usr/local |
31 |
|
32 |
-CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-2.0` |
33 |
-LFLAGS = $(LDFLAGS) `pkg-config --libs gtk+-2.0 gthread-2.0` |
34 |
+CXXFLAGS += -c `pkg-config --cflags gtk+-2.0` |
35 |
+LIBS = `pkg-config --libs gtk+-2.0 gthread-2.0` |
36 |
|
37 |
BINDIR = $(PREFIX)/bin |
38 |
DATADIR = $(PREFIX)/share/$(PROGRAM) |
39 |
-DOCDIR = $(PREFIX)/share/doc/$(PROGRAM) |
40 |
+DOCDIR = $(PREFIX)/share/doc/$(PF) |
41 |
MANDIR = $(PREFIX)/share/man/man1 |
42 |
ICONDIR = $(DATADIR)/icons |
43 |
DESKTOP = $(DATADIR)/kornelix-$(PROGRAM).desktop |
44 |
|
45 |
$(PROGRAM): $(PROGRAM).o zfuncs.o |
46 |
@ ./dependencies.sh |
47 |
- $(CXX) $(LFLAGS) -ltiff -o $(PROGRAM) $(PROGRAM).o zfuncs.o |
48 |
+ $(CXX) $(LDFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o -ltiff $(LIBS) |
49 |
|
50 |
$(PROGRAM).o: $(SOURCE) |
51 |
- $(CXX) $(CFLAGS) -o $(PROGRAM).o $(SOURCE) \ |
52 |
+ $(CXX) $(CXXFLAGS) -o $(PROGRAM).o $(SOURCE) \ |
53 |
-D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" |
54 |
|
55 |
zfuncs.o: zfuncs.cc |
56 |
- $(CXX) $(CFLAGS) zfuncs.cc \ |
57 |
+ $(CXX) $(CXXFLAGS) zfuncs.cc \ |
58 |
-D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" -D "BINDIR=\"$(BINDIR)\"" |
59 |
|
60 |
install: $(PROGRAM) |