public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in media-gfx/fotoxx/files: fotoxx-10.10-makefile.patch fotoxx-makefile.patch
@ 2010-10-02  7:58 Andrey Grozin (grozin)
  0 siblings, 0 replies; only message in thread
From: Andrey Grozin (grozin) @ 2010-10-02  7:58 UTC (permalink / raw
  To: gentoo-commits

grozin      10/10/02 07:58:21

  Added:                fotoxx-10.10-makefile.patch
  Removed:              fotoxx-makefile.patch
  Log:
  Version bump
  
  (Portage version: 2.2_rc88/cvs/Linux i686)

Revision  Changes    Path
1.1                  media-gfx/fotoxx/files/fotoxx-10.10-makefile.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/fotoxx/files/fotoxx-10.10-makefile.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/fotoxx/files/fotoxx-10.10-makefile.patch?rev=1.1&content-type=text/plain

Index: fotoxx-10.10-makefile.patch
===================================================================
diff -U1 -r fotoxx-10.9.1.orig//Makefile fotoxx-10.9.1//Makefile
--- fotoxx-10.9.1.orig//Makefile	2010-09-09 18:12:15.000000000 +0700
+++ fotoxx-10.9.1//Makefile	2010-09-15 06:25:29.000000000 +0700
@@ -7,8 +7,8 @@
 # defaults for parameters that may be pre-defined
-CXXFLAGS ?= -O3 -g -Wall
-LDFLAGS ?= -O3 -g -Wall -rdynamic
+CXXFLAGS += -Wall
+LDFLAGS += -rdynamic
 PREFIX ?= /usr/local
 
-CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-2.0`
-LFLAGS = $(LDFLAGS) `pkg-config --libs gtk+-2.0 gthread-2.0`
+CXXFLAGS += -c `pkg-config --cflags gtk+-2.0`
+LIBS = `pkg-config --libs gtk+-2.0 gthread-2.0`
 
@@ -16,3 +16,3 @@
 DATADIR = $(PREFIX)/share/$(PROGRAM)
-DOCDIR = $(PREFIX)/share/doc/$(PROGRAM)
+DOCDIR = $(PREFIX)/share/doc/$(PF)
 MANDIR = $(PREFIX)/share/man/man1
@@ -23,6 +23,6 @@
 	@ ./dependencies.sh
-	$(CXX) $(LFLAGS) -ltiff -o $(PROGRAM) $(PROGRAM).o zfuncs.o
+	$(CXX) $(LDFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o -ltiff $(LIBS)
 
 $(PROGRAM).o: $(SOURCE)
-	$(CXX) $(CFLAGS) -o $(PROGRAM).o $(SOURCE)		\
+	$(CXX) $(CXXFLAGS) -o $(PROGRAM).o $(SOURCE)            \
 	  -D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\""
@@ -30,3 +30,3 @@
 zfuncs.o: zfuncs.cc
-	$(CXX) $(CFLAGS) zfuncs.cc	\
+	$(CXX) $(CXXFLAGS) zfuncs.cc	\
 	  -D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" -D "BINDIR=\"$(BINDIR)\""






^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2010-10-02  7:58 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-02  7:58 [gentoo-commits] gentoo-x86 commit in media-gfx/fotoxx/files: fotoxx-10.10-makefile.patch fotoxx-makefile.patch Andrey Grozin (grozin)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox