* [gentoo-commits] gentoo-x86 commit in app-misc/nut/files: nut-17.7-makefile.patch
@ 2012-04-25 18:54 Jeroen Roovers (jer)
0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers (jer) @ 2012-04-25 18:54 UTC (permalink / raw
To: gentoo-commits
jer 12/04/25 18:54:25
Added: nut-17.7-makefile.patch
Log:
Version bump.
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
Revision Changes Path
1.1 app-misc/nut/files/nut-17.7-makefile.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/nut/files/nut-17.7-makefile.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/nut/files/nut-17.7-makefile.patch?rev=1.1&content-type=text/plain
Index: nut-17.7-makefile.patch
===================================================================
--- Makefile.org 2012-04-24 19:13:25.000000000 +0200
+++ Makefile 2012-04-25 20:45:25.721953488 +0200
@@ -8,15 +8,6 @@
EXECUTABLE := nut
LIBS := -lm
-FLTK_CONFIG := $(shell fltk-config --version 2>/dev/null)
-ifeq ($(FLTK_CONFIG),)
-HAVE_FLTK = 0
-FLTK_NUT =
-else
-HAVE_FLTK = 1
-FLTK_NUT = fltk/Nut
-endif
-
OS := $(shell uname -s)
ifeq ($(OS),HP-UX)
CC = cc
@@ -25,7 +16,7 @@
OPT = -O1
endif
-CFLAGS := $(OPT) -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR)
+CFLAGS += -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR)
ifeq ($(CC),gcc)
CFLAGS += $(OPT) -Wall -fno-inline -ansi
endif
@@ -38,7 +29,7 @@
all: nut $(FLTK_NUT)
nut: $(OBJS)
- $(CC) $(OPT) -o $(EXECUTABLE) $(OBJS) $(LIBS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $(EXECUTABLE) $(OBJS) $(LIBS)
ifeq ($(HAVE_FLTK),1)
$(FLTK_NUT):
--- fltk/Makefile.org 2012-04-24 19:13:01.000000000 +0200
+++ fltk/Makefile 2012-04-25 20:48:45.668679700 +0200
@@ -5,7 +5,7 @@
NUTDIR := \".nutdb\"
FOODDIR := \"$(libdir)\"
EXECUTABLE := Nut
-LIBS := `fltk-config --ldflags`
+LIBS := $(shell fltk-config --ldflags)
OS := $(shell uname -s)
ifeq ($(OS),HP-UX)
@@ -16,11 +16,7 @@
OPT = -Os
endif
-CFLAGS := -I.. `fltk-config --optim --cflags` $(OPT) -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR)
-
-ifeq ($(CXX),g++)
-CFLAGS := -I.. `fltk-config --optim --cflags` -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR) -Wall -fno-inline -ansi
-endif
+CFLAGS := -I.. $(shell fltk-config --optim --cflags) $(OPT) -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR) -Wall -fno-inline -ansi
CXXFLAGS := $(CFLAGS)
@@ -28,7 +24,7 @@
OBJS := ../anameal.o ../db.o ../food.o ../meal.o ../options.o ../prtmenu.o ../recmeal.o ../util.o $(patsubst %.cc,%.o,$(SOURCE))
nut: $(OBJS)
- $(CXX) $(OPT) -o $(EXECUTABLE) $(OBJS) $(LIBS)
+ $(CXX) $(CFLAGS) $(LDFLAGS) -o $(EXECUTABLE) $(OBJS) $(LIBS)
deps:
makedepend -Y.. ../anameal.c ../db.c ../food.c ../meal.c ../options.c ../prtmenu.c ../recmeal.c ../util.c *.cc >/dev/null 2>&1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-misc/nut/files: nut-17.7-makefile.patch
@ 2012-04-25 19:01 Jeroen Roovers (jer)
0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers (jer) @ 2012-04-25 19:01 UTC (permalink / raw
To: gentoo-commits
jer 12/04/25 19:01:07
Modified: nut-17.7-makefile.patch
Log:
Clean up patch.
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
Revision Changes Path
1.2 app-misc/nut/files/nut-17.7-makefile.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/nut/files/nut-17.7-makefile.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/nut/files/nut-17.7-makefile.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/nut/files/nut-17.7-makefile.patch?r1=1.1&r2=1.2
Index: nut-17.7-makefile.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/nut/files/nut-17.7-makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nut-17.7-makefile.patch 25 Apr 2012 18:54:25 -0000 1.1
+++ nut-17.7-makefile.patch 25 Apr 2012 19:01:06 -0000 1.2
@@ -1,5 +1,5 @@
---- Makefile.org 2012-04-24 19:13:25.000000000 +0200
-+++ Makefile 2012-04-25 20:45:25.721953488 +0200
+--- a/Makefile
++++ b/Makefile
@@ -8,15 +8,6 @@
EXECUTABLE := nut
LIBS := -lm
@@ -34,8 +34,8 @@
ifeq ($(HAVE_FLTK),1)
$(FLTK_NUT):
---- fltk/Makefile.org 2012-04-24 19:13:01.000000000 +0200
-+++ fltk/Makefile 2012-04-25 20:48:45.668679700 +0200
+--- a/fltk/Makefile
++++ b/fltk/Makefile
@@ -5,7 +5,7 @@
NUTDIR := \".nutdb\"
FOODDIR := \"$(libdir)\"
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-misc/nut/files: nut-17.7-makefile.patch
@ 2012-11-21 13:23 Michael Palimaka (kensington)
0 siblings, 0 replies; 3+ messages in thread
From: Michael Palimaka (kensington) @ 2012-11-21 13:23 UTC (permalink / raw
To: gentoo-commits
kensington 12/11/21 13:23:06
Removed: nut-17.7-makefile.patch
Log:
Remove old.
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-11-21 13:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-21 13:23 [gentoo-commits] gentoo-x86 commit in app-misc/nut/files: nut-17.7-makefile.patch Michael Palimaka (kensington)
-- strict thread matches above, loose matches on Subject: below --
2012-04-25 19:01 Jeroen Roovers (jer)
2012-04-25 18:54 Jeroen Roovers (jer)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox