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