packages: fotoxx/fotoxx-Makefile.patch - adjusted for 9.2
amateja
amateja at pld-linux.org
Fri Jan 8 13:47:53 CET 2010
Author: amateja Date: Fri Jan 8 12:47:53 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- adjusted for 9.2
---- Files affected:
packages/fotoxx:
fotoxx-Makefile.patch (1.4 -> 1.5)
---- Diffs:
================================================================
Index: packages/fotoxx/fotoxx-Makefile.patch
diff -u packages/fotoxx/fotoxx-Makefile.patch:1.4 packages/fotoxx/fotoxx-Makefile.patch:1.5
--- packages/fotoxx/fotoxx-Makefile.patch:1.4 Mon Dec 28 09:46:11 2009
+++ packages/fotoxx/fotoxx-Makefile.patch Fri Jan 8 13:47:47 2010
@@ -5,7 +5,7 @@
# replace CFLAGS and LFLAGS -O3 with -g for GDB debugging
-CFLAGS = -O3 -Wall -c `pkg-config --cflags gtk+-2.0`
--LFLAGS = -O3 -Wall -rdynamic `pkg-config --libs gtk+-2.0 gthread-2.0`
+-LFLAGS = -O3 -Wall -rdynamic `pkg-config --libs gtk+-2.0`
+CFLAGS := $(OPTCFLAGS) -Wall $(shell pkg-config --cflags gtk+-2.0)
+LDFLAGS := $(OPTLDFLAGS) -rdynamic
+LIBS := $(OPTLIBS) $(shell pkg-config --libs gtk+-2.0 gthread-2.0) -lfreeimage
@@ -15,7 +15,7 @@
ifeq "$(PREFIX)" ""
@@ -21,14 +23,14 @@
- $(PROGRAM): $(PROGRAM).o zfuncs.o
+ $(PROGRAM): $(PROGRAM).o zfuncs.O
@ ./dependencies.sh
- @ g++ $(LFLAGS) -lfreeimage -o $(PROGRAM) $(PROGRAM).o zfuncs.o
+ $(CXX) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fotoxx/fotoxx-Makefile.patch?r1=1.4&r2=1.5&f=u
More information about the pld-cvs-commit
mailing list