From d33acbe3c7558d9ce326cf05faca30060bc64a3e Mon Sep 17 00:00:00 2001
From: Mohamed Boussaffa <mbfoss@fastmail.com>
Date: Sun, 13 Mar 2016 01:48:33 +0800
Subject: [PATCH] building as static library too

---
 .gitignore  |  1 +
 MakeApp.mk  |  4 +---
 MakeLib.mk  | 19 +++++++++----------
 cui.cpp     |  1 -
 process.cpp | 15 +++++----------
 refresh.cpp |  0
 6 files changed, 16 insertions(+), 24 deletions(-)
 delete mode 100644 refresh.cpp

diff --git a/.gitignore b/.gitignore
index ea374df..2cd66cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ TAGS
 *~
 nethogs.project
 libnethogs.so
+libnethogs.a
diff --git a/MakeApp.mk b/MakeApp.mk
index 3f292d8..9a82ebd 100644
--- a/MakeApp.mk
+++ b/MakeApp.mk
@@ -15,7 +15,7 @@ runtests: test
 CFLAGS?=-Wall -Wextra
 CXXFLAGS?=-Wall -Wextra
 
-OBJS=packet.o connection.o process.o refresh.o decpcap.o cui.o inode2prog.o conninode.o devices.o
+OBJS=packet.o connection.o process.o decpcap.o cui.o inode2prog.o conninode.o devices.o
 
 NCURSES_LIBS?=-lncurses
 
@@ -52,8 +52,6 @@ decpcap_test: decpcap_test.cpp decpcap.o
 
 #-lefence
 
-refresh.o: refresh.cpp refresh.h nethogs.h
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c refresh.cpp
 process.o: process.cpp process.h nethogs.h
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c process.cpp
 packet.o: packet.cpp packet.h nethogs.h
diff --git a/MakeLib.mk b/MakeLib.mk
index 1795950..ab71646 100644
--- a/MakeLib.mk
+++ b/MakeLib.mk
@@ -2,7 +2,7 @@ prefix := /usr/local
 libdir := $(prefix)/lib
 incdir := $(prefix)/include
 
-all: libnethogs.so
+all: libnethogs.so libnethogs.a
 		
 LDFLAGS:= -shared
 CXXINCLUDES :=
@@ -22,7 +22,7 @@ else
   CXXFLAGS?=-Wall -Wextra -O3 -fPIC $(VISIBILITY) $(CXXINCLUDES)
 endif
 
-OBJ_NAMES= libnethogs.o packet.o connection.o process.o refresh.o decpcap.o inode2prog.o conninode.o devices.o
+OBJ_NAMES= libnethogs.o packet.o connection.o process.o decpcap.o inode2prog.o conninode.o devices.o
 OBJS=$(addprefix $(ODIR)/,$(OBJ_NAMES))
 
 #$(info $(OBJS))
@@ -34,29 +34,27 @@ OBJS=$(addprefix $(ODIR)/,$(OBJ_NAMES))
 install: libnethogs.so
 	install -d -m 755 $(DESTDIR)$(libdir)
 	install -m 755 libnethogs.so $(DESTDIR)$(libdir)
-	@echo
 	@echo "Installed libnethogs.so to $(DESTDIR)$(libdir)"
-	@echo
+	install -m 755 libnethogs.a $(DESTDIR)$(libdir)
+	@echo "Installed libnethogs.a to $(DESTDIR)$(libdir)"
 	install -d -m 755 $(DESTDIR)$(incdir)
 	install -m 755 libnethogs.h $(DESTDIR)$(incdir)
-	@echo
 	@echo "Installed libnethogs.h to $(DESTDIR)$(incdir)"
-	@echo
 	ldconfig
 
 uninstall:
 	rm $(DESTDIR)$(libdir)/libnethogs.so
+	rm $(DESTDIR)$(libdir)/libnethogs.a
 	rm $(DESTDIR)$(incdir)/libnethogs.h
 	ldconfig
 
 libnethogs.so: $(OBJS)
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $(OBJS) -o $@ -lpcap
 
-#-lefence
+libnethogs.a: $(OBJS)
+	$(AR) rcs $@ $(OBJS)
 
-$(ODIR)/refresh.o: refresh.cpp refresh.h nethogs.h
-	@mkdir -p $(ODIR)
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ -c refresh.cpp
+#-lefence
 
 $(ODIR)/process.o: process.cpp process.h nethogs.h
 	@mkdir -p $(ODIR)
@@ -94,6 +92,7 @@ $(ODIR)/libnethogs.o: libnethogs.cpp libnethogs.h
 clean:
 	rm -f $(OBJS)
 	rm -f libnethogs.so
+	rm -f libnethogs.a
 	mkdir -p $(ODIR)
 	rmdir -p --ignore-fail-on-non-empty $(ODIR)
 
diff --git a/cui.cpp b/cui.cpp
index 1e188e6..ca7aa90 100644
--- a/cui.cpp
+++ b/cui.cpp
@@ -32,7 +32,6 @@
 #include <ncurses.h>
 #include "nethogs.h"
 #include "process.h"
-#include "refresh.h"
 
 std::string * caption;
 extern const char version[];
diff --git a/process.cpp b/process.cpp
index a5fbbf6..0e92ca9 100644
--- a/process.cpp
+++ b/process.cpp
@@ -118,8 +118,7 @@ int Process::getLastPacket()
 /** Get the kb/s values for this process */
 void Process::getkbps (float * recvd, float * sent)
 {
-	u_int32_t sum_sent = 0,
-	  	sum_recv = 0;
+	u_int32_t sum_sent = 0, sum_recv = 0;
 
 	/* walk though all this process's connections, and sum
 	 * them up */
@@ -157,8 +156,7 @@ void Process::getkbps (float * recvd, float * sent)
 /** get total values for this process */
 void Process::gettotal( u_int32_t * recvd, u_int32_t * sent)
 {
-	u_int32_t sum_sent = 0,
-	  	sum_recv = 0;
+	u_int32_t sum_sent = 0, sum_recv = 0;
 	ConnList * curconn = this->connections;
 	while (curconn != NULL)
 	{
@@ -175,8 +173,7 @@ void Process::gettotal( u_int32_t * recvd, u_int32_t * sent)
 
 void Process::gettotalmb(float * recvd, float * sent)
 {
-	u_int32_t sum_sent = 0,
-	  	sum_recv = 0;
+	u_int32_t sum_sent = 0, sum_recv = 0;
 	gettotal(&sum_recv, &sum_sent);
 	*recvd = tomb(sum_recv);
 	*sent = tomb(sum_sent);
@@ -185,8 +182,7 @@ void Process::gettotalmb(float * recvd, float * sent)
 /** get total values for this process */
 void Process::gettotalkb(float * recvd, float * sent)
 {
-	u_int32_t sum_sent = 0,
-	  	sum_recv = 0;
+	u_int32_t sum_sent = 0, sum_recv = 0;
 	gettotal(&sum_recv, &sum_sent);
 	*recvd = tokb(sum_recv);
 	*sent = tokb(sum_sent);
@@ -194,8 +190,7 @@ void Process::gettotalkb(float * recvd, float * sent)
 
 void Process::gettotalb(float * recvd, float * sent)
 {
-	u_int32_t sum_sent = 0,
-	  	sum_recv = 0;
+	u_int32_t sum_sent = 0, sum_recv = 0;
 	gettotal(&sum_recv, &sum_sent);
 	//std::cout << "Total sent: " << sum_sent << std::endl;
 	*sent = sum_sent;
diff --git a/refresh.cpp b/refresh.cpp
deleted file mode 100644
index e69de29..0000000