Author: amateja Date: Mon Mar 15 08:10:47 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- adjusted for 9.7
---- Files affected:
packages/fotoxx:
fotoxx-Makefile.patch (1.6 -> 1.7)
---- Diffs:
================================================================
Index: packages/fotoxx/fotoxx-Makefile.patch
diff -u packages/fotoxx/fotoxx-Makefile.patch:1.6
packages/fotoxx/fotoxx-Makefile.patch:1.7
--- packages/fotoxx/fotoxx-Makefile.patch:1.6 Wed Jan 20 10:03:37 2010
+++ packages/fotoxx/fotoxx-Makefile.patch Mon Mar 15 09:10:42 2010
@@ -1,5 +1,5 @@
---- fotoxx-8.7/Makefile.orig 2009-11-24 20:37:25.000000000 +0100
-+++ fotoxx-8.7/Makefile 2009-11-26 15:12:11.000000000 +0100
+--- fotoxx-9.7/Makefile.orig 2010-03-10 06:28:55.000000000 +0100
++++ fotoxx-9.7/Makefile 2010-03-15 09:04:09.000000000 +0100
@@ -5,8 +5,10 @@
SOURCE = $(PROGRAM)-$(VERSION).cpp
@@ -13,12 +13,13 @@
# use $PREFIX if defined, else assume /usr/local
ifeq "$(PREFIX)" ""
-@@ -21,14 +23,14 @@
+@@ -22,15 +24,15 @@
- $(PROGRAM): $(PROGRAM).o zfuncs.O
+ $(PROGRAM): $(PROGRAM).o zfuncs.o
@ ./dependencies.sh
-- @ g++ $(LFLAGS) -lfreeimage -o $(PROGRAM) $(PROGRAM).o zfuncs.o
+- @ g++ $(LFLAGS) -lfreeimage -o $(PROGRAM) $(PROGRAM).o zfuncs.o
# dynamic link
+ $(CXX) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+ # @ g++ $(LFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o
/usr/lib/libfreeimage.a # static link
$(PROGRAM).o: $(SOURCE)
- @ g++ $(CFLAGS) -o $(PROGRAM).o $(SOURCE) \
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fotoxx/fotoxx-Makefile.patch?r1=1.6&r2=1.7&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
