| 1 |
ssuominen 09/04/29 06:50:46 |
| 2 |
|
| 3 |
Added: nethogs-0.7.0-Makefile.patch |
| 4 |
Removed: nethogs-0.6.0-gcc34.diff |
| 5 |
Log: |
| 6 |
Version bump. |
| 7 |
(Portage version: 2.1.6.11/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-analyzer/nethogs/files/nethogs-0.7.0-Makefile.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/nethogs/files/nethogs-0.7.0-Makefile.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/nethogs/files/nethogs-0.7.0-Makefile.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: nethogs-0.7.0-Makefile.patch |
| 16 |
=================================================================== |
| 17 |
Replace CFLAGS for CXX target with CXXFLAGS. Add LDFLAGS to respect them. |
| 18 |
Use DESTDIR correctly, and fix typing error of sbin. - ssuominen@g.o |
| 19 |
|
| 20 |
diff -ur nethogs.orig/Makefile nethogs/Makefile |
| 21 |
--- nethogs.orig/Makefile 2009-03-12 23:08:17.000000000 +0000 |
| 22 |
+++ nethogs/Makefile 2009-04-29 09:41:11.000000000 +0000 |
| 23 |
@@ -2,17 +2,17 @@ |
| 24 |
SUBVERSION := 7 |
| 25 |
MINORVERSION := 0 |
| 26 |
|
| 27 |
-#DESTDIR := /usr |
| 28 |
-DESTDIR := /usr/local |
| 29 |
- |
| 30 |
-sbin := $(DESTDIR)/sbin |
| 31 |
-man8 := $(DESTDIR)/share/man/man8/ |
| 32 |
+prefix := /usr |
| 33 |
+# prefix := /usr/local |
| 34 |
+sbin := $(prefix)/sbin |
| 35 |
+man8 := $(prefix)/share/man/man8 |
| 36 |
|
| 37 |
all: nethogs decpcap_test |
| 38 |
# nethogs_testsum |
| 39 |
|
| 40 |
-CFLAGS=-g -Wall -Wextra |
| 41 |
-#CFLAGS=-O2 |
| 42 |
+CFLAGS += -Wall |
| 43 |
+CXXFLAGS += -Wall |
| 44 |
+ |
| 45 |
OBJS=packet.o connection.o process.o refresh.o decpcap.o cui.o inode2prog.o conninode.o |
| 46 |
.PHONY: tgz |
| 47 |
|
| 48 |
@@ -24,37 +24,37 @@ |
| 49 |
echo "Not implemented" |
| 50 |
|
| 51 |
install: nethogs nethogs.8 |
| 52 |
- install -d -m 755 $(bin) |
| 53 |
- install -m 755 nethogs $(bin) |
| 54 |
- install -d -m 755 $(man8) |
| 55 |
- install -m 644 nethogs.8 $(man8) |
| 56 |
+ install -d -m 755 $(DESTDIR)$(sbin) |
| 57 |
+ install -m 755 nethogs $(DESTDIR)$(sbin) |
| 58 |
+ install -d -m 755 $(DESTDIR)$(man8) |
| 59 |
+ install -m 644 nethogs.8 $(DESTDIR)$(man8) |
| 60 |
|
| 61 |
nethogs: nethogs.cpp $(OBJS) |
| 62 |
- $(CXX) $(CFLAGS) nethogs.cpp $(OBJS) -o nethogs -lpcap -lm -lncurses -DVERSION=\"$(VERSION)\" -DSUBVERSION=\"$(SUBVERSION)\" -DMINORVERSION=\"$(MINORVERSION)\" |
| 63 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) nethogs.cpp $(OBJS) -o nethogs -lpcap -lm -lncurses -DVERSION=\"$(VERSION)\" -DSUBVERSION=\"$(SUBVERSION)\" -DMINORVERSION=\"$(MINORVERSION)\" |
| 64 |
nethogs_testsum: nethogs_testsum.cpp $(OBJS) |
| 65 |
- $(CXX) $(CFLAGS) -g nethogs_testsum.cpp $(OBJS) -o nethogs_testsum -lpcap -lm -lncurses -DVERSION=\"$(VERSION)\" -DSUBVERSION=\"$(SUBVERSION)\" -DMINORVERSION=\"$(MINORVERSION)\" |
| 66 |
+ $(CXX) $(CXXFLAGS) -g $(LDFLAGS) nethogs_testsum.cpp $(OBJS) -o nethogs_testsum -lpcap -lm -lncurses -DVERSION=\"$(VERSION)\" -DSUBVERSION=\"$(SUBVERSION)\" -DMINORVERSION=\"$(MINORVERSION)\" |
| 67 |
|
| 68 |
decpcap_test: decpcap_test.cpp decpcap.o |
| 69 |
- $(CXX) $(CFLAGS) decpcap_test.cpp decpcap.o -o decpcap_test -lpcap -lm |
| 70 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) decpcap_test.cpp decpcap.o -o decpcap_test -lpcap -lm |
| 71 |
|
| 72 |
#-lefence |
| 73 |
|
| 74 |
refresh.o: refresh.cpp refresh.h nethogs.h |
| 75 |
- $(CXX) $(CFLAGS) -c refresh.cpp |
| 76 |
+ $(CXX) $(CXXFLAGS) -c refresh.cpp |
| 77 |
process.o: process.cpp process.h nethogs.h |
| 78 |
- $(CXX) $(CFLAGS) -c process.cpp |
| 79 |
+ $(CXX) $(CXXFLAGS) -c process.cpp |
| 80 |
packet.o: packet.cpp packet.h nethogs.h |
| 81 |
- $(CXX) $(CFLAGS) -c packet.cpp |
| 82 |
+ $(CXX) $(CXXFLAGS) -c packet.cpp |
| 83 |
connection.o: connection.cpp connection.h nethogs.h |
| 84 |
- $(CXX) $(CFLAGS) -c connection.cpp |
| 85 |
+ $(CXX) $(CXXFLAGS) -c connection.cpp |
| 86 |
decpcap.o: decpcap.c decpcap.h |
| 87 |
$(CC) $(CFLAGS) -c decpcap.c |
| 88 |
inode2prog.o: inode2prog.cpp inode2prog.h nethogs.h |
| 89 |
- $(CXX) $(CFLAGS) -c inode2prog.cpp |
| 90 |
+ $(CXX) $(CXXFLAGS) -c inode2prog.cpp |
| 91 |
conninode.o: conninode.cpp nethogs.h conninode.h |
| 92 |
- $(CXX) $(CFLAGS) -c conninode.cpp |
| 93 |
+ $(CXX) $(CXXFLAGS) -c conninode.cpp |
| 94 |
cui.o: cui.cpp cui.h nethogs.h |
| 95 |
- $(CXX) $(CFLAGS) -c cui.cpp -DVERSION=\"$(VERSION)\" -DSUBVERSION=\"$(SUBVERSION)\" -DMINORVERSION=\"$(MINORVERSION)\" |
| 96 |
+ $(CXX) $(CXXFLAGS) -c cui.cpp -DVERSION=\"$(VERSION)\" -DSUBVERSION=\"$(SUBVERSION)\" -DMINORVERSION=\"$(MINORVERSION)\" |
| 97 |
|
| 98 |
.PHONY: clean |
| 99 |
clean: |
Archives