From e7a74b00fb0ae596cc214bdd9de158c7bce0d3da Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Sun, 27 Mar 2016 23:14:33 +0200 Subject: [PATCH] Move sources to 'src' directory --- Makefile | 28 +++++++++---------- nethogs.8 => doc/nethogs.8 | 0 MakeApp.mk => src/MakeApp.mk | 0 MakeLib.mk => src/MakeLib.mk | 0 connection.cpp => src/connection.cpp | 0 connection.h => src/connection.h | 0 conninode.cpp => src/conninode.cpp | 0 conninode.h => src/conninode.h | 0 conninode_test.cpp => src/conninode_test.cpp | 0 cui.cpp => src/cui.cpp | 0 cui.h => src/cui.h | 0 decpcap.c => src/decpcap.c | 0 decpcap.h => src/decpcap.h | 0 decpcap_test.cpp => src/decpcap_test.cpp | 0 devices.cpp => src/devices.cpp | 0 devices.h => src/devices.h | 0 inode2prog.cpp => src/inode2prog.cpp | 0 inode2prog.h => src/inode2prog.h | 0 libnethogs.cpp => src/libnethogs.cpp | 0 libnethogs.h => src/libnethogs.h | 0 main.cpp => src/main.cpp | 0 nethogs.cpp => src/nethogs.cpp | 0 nethogs.h => src/nethogs.h | 0 packet.cpp => src/packet.cpp | 0 packet.h => src/packet.h | 0 process.cpp => src/process.cpp | 0 process.h => src/process.h | 0 {testfiles => src/testfiles}/proc_net_tcp | 0 {testfiles => src/testfiles}/proc_net_tcp_big | 0 29 files changed, 14 insertions(+), 14 deletions(-) rename nethogs.8 => doc/nethogs.8 (100%) rename MakeApp.mk => src/MakeApp.mk (100%) rename MakeLib.mk => src/MakeLib.mk (100%) rename connection.cpp => src/connection.cpp (100%) rename connection.h => src/connection.h (100%) rename conninode.cpp => src/conninode.cpp (100%) rename conninode.h => src/conninode.h (100%) rename conninode_test.cpp => src/conninode_test.cpp (100%) rename cui.cpp => src/cui.cpp (100%) rename cui.h => src/cui.h (100%) rename decpcap.c => src/decpcap.c (100%) rename decpcap.h => src/decpcap.h (100%) rename decpcap_test.cpp => src/decpcap_test.cpp (100%) rename devices.cpp => src/devices.cpp (100%) rename devices.h => src/devices.h (100%) rename inode2prog.cpp => src/inode2prog.cpp (100%) rename inode2prog.h => src/inode2prog.h (100%) rename libnethogs.cpp => src/libnethogs.cpp (100%) rename libnethogs.h => src/libnethogs.h (100%) rename main.cpp => src/main.cpp (100%) rename nethogs.cpp => src/nethogs.cpp (100%) rename nethogs.h => src/nethogs.h (100%) rename packet.cpp => src/packet.cpp (100%) rename packet.h => src/packet.h (100%) rename process.cpp => src/process.cpp (100%) rename process.h => src/process.h (100%) rename {testfiles => src/testfiles}/proc_net_tcp (100%) rename {testfiles => src/testfiles}/proc_net_tcp_big (100%) diff --git a/Makefile b/Makefile index 3f5c898..81cb9ae 100644 --- a/Makefile +++ b/Makefile @@ -3,39 +3,39 @@ export SUBVERSION := 8 export MINORVERSION := 2-SNAPSHOT all: nethogs decpcap_test test - $(MAKE) -f MakeApp.mk $@ - $(MAKE) -f MakeLib.mk $@ + $(MAKE) -C src -f MakeApp.mk $@ + $(MAKE) -C src -f MakeLib.mk $@ .PHONY: tgz: clean cd .. ; tar czvf nethogs-$(VERSION).$(SUBVERSION).$(MINORVERSION).tar.gz --exclude-vcs nethogs/* check: - $(MAKE) -f MakeApp.mk $@ + $(MAKE) -C src -f MakeApp.mk $@ install: - $(MAKE) -f MakeApp.mk $@ - $(MAKE) -f MakeLib.mk $@ + $(MAKE) -C src -f MakeApp.mk $@ + $(MAKE) -C src -f MakeLib.mk $@ install_dev: - $(MAKE) -f MakeLib.mk $@ + $(MAKE) -C src -f MakeLib.mk $@ uninstall: - $(MAKE) -f MakeApp.mk $@ - $(MAKE) -f MakeLib.mk $@ + $(MAKE) -C src -f MakeApp.mk $@ + $(MAKE) -C src -f MakeLib.mk $@ nethogs: - $(MAKE) -f MakeApp.mk $@ + $(MAKE) -C src -f MakeApp.mk $@ decpcap_test: - $(MAKE) -f MakeApp.mk $@ + $(MAKE) -C src -f MakeApp.mk $@ test: - $(MAKE) -f MakeApp.mk $@ + $(MAKE) -C src -f MakeApp.mk $@ clean: - $(MAKE) -f MakeApp.mk $@ - $(MAKE) -f MakeLib.mk $@ + $(MAKE) -C src -f MakeApp.mk $@ + $(MAKE) -C src -f MakeLib.mk $@ format: - clang-format -i *.c *.cpp *.h + clang-format -i src/*.c src/*.cpp src/*.h diff --git a/nethogs.8 b/doc/nethogs.8 similarity index 100% rename from nethogs.8 rename to doc/nethogs.8 diff --git a/MakeApp.mk b/src/MakeApp.mk similarity index 100% rename from MakeApp.mk rename to src/MakeApp.mk diff --git a/MakeLib.mk b/src/MakeLib.mk similarity index 100% rename from MakeLib.mk rename to src/MakeLib.mk diff --git a/connection.cpp b/src/connection.cpp similarity index 100% rename from connection.cpp rename to src/connection.cpp diff --git a/connection.h b/src/connection.h similarity index 100% rename from connection.h rename to src/connection.h diff --git a/conninode.cpp b/src/conninode.cpp similarity index 100% rename from conninode.cpp rename to src/conninode.cpp diff --git a/conninode.h b/src/conninode.h similarity index 100% rename from conninode.h rename to src/conninode.h diff --git a/conninode_test.cpp b/src/conninode_test.cpp similarity index 100% rename from conninode_test.cpp rename to src/conninode_test.cpp diff --git a/cui.cpp b/src/cui.cpp similarity index 100% rename from cui.cpp rename to src/cui.cpp diff --git a/cui.h b/src/cui.h similarity index 100% rename from cui.h rename to src/cui.h diff --git a/decpcap.c b/src/decpcap.c similarity index 100% rename from decpcap.c rename to src/decpcap.c diff --git a/decpcap.h b/src/decpcap.h similarity index 100% rename from decpcap.h rename to src/decpcap.h diff --git a/decpcap_test.cpp b/src/decpcap_test.cpp similarity index 100% rename from decpcap_test.cpp rename to src/decpcap_test.cpp diff --git a/devices.cpp b/src/devices.cpp similarity index 100% rename from devices.cpp rename to src/devices.cpp diff --git a/devices.h b/src/devices.h similarity index 100% rename from devices.h rename to src/devices.h diff --git a/inode2prog.cpp b/src/inode2prog.cpp similarity index 100% rename from inode2prog.cpp rename to src/inode2prog.cpp diff --git a/inode2prog.h b/src/inode2prog.h similarity index 100% rename from inode2prog.h rename to src/inode2prog.h diff --git a/libnethogs.cpp b/src/libnethogs.cpp similarity index 100% rename from libnethogs.cpp rename to src/libnethogs.cpp diff --git a/libnethogs.h b/src/libnethogs.h similarity index 100% rename from libnethogs.h rename to src/libnethogs.h diff --git a/main.cpp b/src/main.cpp similarity index 100% rename from main.cpp rename to src/main.cpp diff --git a/nethogs.cpp b/src/nethogs.cpp similarity index 100% rename from nethogs.cpp rename to src/nethogs.cpp diff --git a/nethogs.h b/src/nethogs.h similarity index 100% rename from nethogs.h rename to src/nethogs.h diff --git a/packet.cpp b/src/packet.cpp similarity index 100% rename from packet.cpp rename to src/packet.cpp diff --git a/packet.h b/src/packet.h similarity index 100% rename from packet.h rename to src/packet.h diff --git a/process.cpp b/src/process.cpp similarity index 100% rename from process.cpp rename to src/process.cpp diff --git a/process.h b/src/process.h similarity index 100% rename from process.h rename to src/process.h diff --git a/testfiles/proc_net_tcp b/src/testfiles/proc_net_tcp similarity index 100% rename from testfiles/proc_net_tcp rename to src/testfiles/proc_net_tcp diff --git a/testfiles/proc_net_tcp_big b/src/testfiles/proc_net_tcp_big similarity index 100% rename from testfiles/proc_net_tcp_big rename to src/testfiles/proc_net_tcp_big