move soures to src subdir

34 files changed, 127 insertions, 106 deletions

diff --git a/Makefile b/Makefile
index cb61dde..dd95dec 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,6 @@
 
 -include config.mk
 
-BIN_TARGETS = mtu
-SBIN_TARGETS = pingu pinguctl
-
-TARGETS = $(BIN_TARGETS) $(SBIN_TARGETS) $(LUA_TARGETS)
 PINGU_VERSION := $(shell \
 	if [ -d .git ]; then \
 		git describe --long; \
@@ -12,115 +8,18 @@ PINGU_VERSION := $(shell \
 		echo $(PACKAGE_VERSION); \
 	fi)
 
-prefix ?= /usr/local
-exec_prefix ?= $(prefix)
-bindir ?= $(exec_prefix)/bin
-sbindir ?= $(exec_prefix)/sbin
-sysconfdir ?= $(prefix)/etc
-localstatedir ?= $(prefix)/var
-libdir ?= $(exec_prefix)/lib
-datarootdir ?= $(prefix)/share
-mandir ?= $(datarootdir)/man
-
-rundir ?= $(localstatedir)/run
-
-pingustatedir = $(rundir)/pingu
-
-DESTDIR ?=
-
-INSTALL = install
-INSTALLDIR = $(INSTALL) -d
-PKG_CONFIG ?= pkg-config
-
-ifdef LUAPC
-LUA_TARGETS := client.so
-INSTALL_LUA_TARGET := install-lua
-LUA_CFLAGS := $(shell $(PKG_CONFIG) --cflags $(LUAPC))
-LUA_VERSION ?= $(shell $(PKG_CONFIG) --variable V $(LUAPC))
-
-luasharedir := $(datarootdir)/lua/$(LUA_VERSION)
-lualibdir := $(libdir)/lua/$(LUA_VERSION)
-
-endif
-
-SUBDIRS := man
-
-CFLAGS ?= -g
-CFLAGS += -DPINGU_VERSION=\"$(PINGU_VERSION)\"
-CFLAGS += -Wall -Wstrict-prototypes -D_GNU_SOURCE -std=gnu99
-CFLAGS += -DDEFAULT_PIDFILE=\"$(pingustatedir)/pingu.pid\"
-CFLAGS += -DDEFAULT_CONFIG=\"$(sysconfdir)/pingu/pingu.conf\"
-CFLAGS += -DDEFAULT_ADM_client=\"$(pingustatedir)/pingu.ctl\"
-
-pingu_OBJS = \
-	icmp.o \
-	log.o \
-	pingu.o \
-	pingu_adm.o \
-	pingu_burst.o \
-	pingu_conf.o \
-	pingu_host.o \
-	pingu_iface.o \
-	pingu_netlink.o \
-	pingu_ping.o \
-	pingu_route.o \
-	sockaddr_util.o \
-	xlib.o
+export PINGU_VERSION
 
-pingu_LIBS = -lev
+SUBDIRS := man src
 
-pinguctl_OBJS = \
-	log.o \
-	pinguctl.o
-
-pinguctl_LIBS =
-
-mtu_OBJS = \
-	mtu.o \
-	netlink.o \
-	icmp.o
-
-lua-client.o_CFLAGS = $(LUA_CFLAGS)
-client.so_OBJS = \
-	lua-client.o
-
-client.so_LDFLAGS = -shared
-
-ALL_OBJS= $(pingu_OBJS) $(pinguctl_OBJS) $(mtu_OBJS) $(client.so_OBJS)
-
-all: $(TARGETS) man
-
-%.o: %.c
-	$(CC) $(CFLAGS) $($@_CFLAGS) -c $<
-
-$(TARGETS):
-	$(CC) $(LDFLAGS) $($@_LDFLAGS) $($@_OBJS) $($@_LIBS) -o $@
-
-pingu: $(pingu_OBJS)
-pinguctl: $(pinguctl_OBJS)
-client.so: $(client.so_OBJS)
-mtu: $(mtu_OBJS)
+all: $(SUBDIRS)
 
 $(SUBDIRS):
 	$(MAKE) -C $@
 
-install: $(TARGETS) $(INSTALL_LUA_TARGET)
-	$(INSTALLDIR) $(DESTDIR)/$(bindir) $(DESTDIR)/$(sbindir) \
-		$(DESTDIR)/$(pingustatedir)
-	$(INSTALL) $(BIN_TARGETS) $(DESTDIR)/$(bindir)
-	$(INSTALL) $(SBIN_TARGETS) $(DESTDIR)/$(sbindir)
+install clean:
 	for dir in $(SUBDIRS); do \
 		$(MAKE) -C $$dir $@ || break; \
 	done
 
-install-lua: client.so pingu.lua
-	$(INSTALLDIR) $(DESTDIR)$(luasharedir) \
-		$(DESTDIR)$(lualibdir)/pingu
-	$(INSTALL) pingu.lua $(DESTDIR)$(luasharedir)/
-	$(INSTALL) client.so $(DESTDIR)$(lualibdir)/pingu/
-
-clean:
-	rm -f $(TARGETS) $(ALL_OBJS)
-	$(MAKE) -C man clean
-
-.PHONY: $(SUBDIRS)
+.PHONY: $(SUBDIRS) all install clean
diff --git a/src/Makefile b/src/Makefile
new file mode 100644
index 0000000..821295e
--- /dev/null
+++ b/src/Makefile
@@ -0,0 +1,122 @@
+
+-include ../config.mk
+
+BIN_TARGETS = mtu
+SBIN_TARGETS = pingu pinguctl
+
+TARGETS = $(BIN_TARGETS) $(SBIN_TARGETS) $(LUA_TARGETS)
+
+prefix ?= /usr/local
+exec_prefix ?= $(prefix)
+bindir ?= $(exec_prefix)/bin
+sbindir ?= $(exec_prefix)/sbin
+sysconfdir ?= $(prefix)/etc
+localstatedir ?= $(prefix)/var
+libdir ?= $(exec_prefix)/lib
+datarootdir ?= $(prefix)/share
+
+rundir ?= $(localstatedir)/run
+
+pingustatedir = $(rundir)/pingu
+
+DESTDIR ?=
+
+INSTALL = install
+INSTALLDIR = $(INSTALL) -d
+PKG_CONFIG ?= pkg-config
+
+ifdef LUAPC
+LUA_TARGETS := client.so
+INSTALL_LUA_TARGET := install-lua
+LUA_CFLAGS := $(shell $(PKG_CONFIG) --cflags $(LUAPC))
+LUA_VERSION ?= $(shell $(PKG_CONFIG) --variable V $(LUAPC))
+
+luasharedir := $(datarootdir)/lua/$(LUA_VERSION)
+lualibdir := $(libdir)/lua/$(LUA_VERSION)
+
+endif
+
+SUBDIRS :=
+
+CFLAGS ?= -g
+CFLAGS += -I../
+CFLAGS += -DPINGU_VERSION=\"$(PINGU_VERSION)\"
+CFLAGS += -Wall -Wstrict-prototypes -D_GNU_SOURCE -std=gnu99
+CFLAGS += -DDEFAULT_PIDFILE=\"$(pingustatedir)/pingu.pid\"
+CFLAGS += -DDEFAULT_CONFIG=\"$(sysconfdir)/pingu/pingu.conf\"
+CFLAGS += -DDEFAULT_ADM_client=\"$(pingustatedir)/pingu.ctl\"
+
+pingu_OBJS = \
+	icmp.o \
+	log.o \
+	pingu.o \
+	pingu_adm.o \
+	pingu_burst.o \
+	pingu_conf.o \
+	pingu_host.o \
+	pingu_iface.o \
+	pingu_netlink.o \
+	pingu_ping.o \
+	pingu_route.o \
+	sockaddr_util.o \
+	xlib.o
+
+pingu_LIBS = -lev
+
+pinguctl_OBJS = \
+	log.o \
+	pinguctl.o
+
+pinguctl_LIBS =
+
+mtu_OBJS = \
+	mtu.o \
+	netlink.o \
+	icmp.o
+
+lua-client.o_CFLAGS = $(LUA_CFLAGS)
+client.so_OBJS = \
+	lua-client.o
+
+client.so_LDFLAGS = -shared
+
+ALL_OBJS= $(pingu_OBJS) $(pinguctl_OBJS) $(mtu_OBJS) $(client.so_OBJS)
+
+all: $(TARGETS)
+
+%.o: %.c
+	$(CC) $(CFLAGS) $($@_CFLAGS) -c $<
+
+$(TARGETS):
+	$(CC) $(LDFLAGS) $($@_LDFLAGS) $($@_OBJS) $($@_LIBS) -o $@
+
+pingu: $(pingu_OBJS)
+pinguctl: $(pinguctl_OBJS)
+client.so: $(client.so_OBJS)
+mtu: $(mtu_OBJS)
+
+$(SUBDIRS):
+	$(MAKE) -C $@
+
+install: $(TARGETS) $(INSTALL_LUA_TARGET)
+	$(INSTALLDIR) $(DESTDIR)/$(bindir) $(DESTDIR)/$(sbindir) \
+		$(DESTDIR)/$(pingustatedir)
+	$(INSTALL) $(BIN_TARGETS) $(DESTDIR)/$(bindir)
+	$(INSTALL) $(SBIN_TARGETS) $(DESTDIR)/$(sbindir)
+	for dir in $(SUBDIRS); do \
+		$(MAKE) -C $$dir $@ || break; \
+	done
+
+install-lua: client.so pingu.lua
+	$(INSTALLDIR) $(DESTDIR)$(luasharedir) \
+		$(DESTDIR)$(lualibdir)/pingu
+	$(INSTALL) pingu.lua $(DESTDIR)$(luasharedir)/
+	$(INSTALL) client.so $(DESTDIR)$(lualibdir)/pingu/
+
+clean:
+	rm -f $(TARGETS) $(ALL_OBJS)
+	for dir in $(SUBDIRS); do \
+		$(MAKE) -C $$dir $@ || break; \
+	done
+
+.PHONY: $(SUBDIRS)
diff --git a/icmp.c b/src/icmp.c
index eb1ec5c..eb1ec5c 100644
--- a/icmp.c
+++ b/src/icmp.c
diff --git a/icmp.h b/src/icmp.h
index 0fc94e1..0fc94e1 100644
--- a/icmp.h
+++ b/src/icmp.h
diff --git a/list.h b/src/list.h
index 1fca5e7..1fca5e7 100644
--- a/list.h
+++ b/src/list.h
diff --git a/log.c b/src/log.c
index 85a32e6..85a32e6 100644
--- a/log.c
+++ b/src/log.c
diff --git a/log.h b/src/log.h
index a7d4688..a7d4688 100644
--- a/log.h
+++ b/src/log.h
diff --git a/lua-client.c b/src/lua-client.c
index ad18f30..ad18f30 100644
--- a/lua-client.c
+++ b/src/lua-client.c
diff --git a/mtu.c b/src/mtu.c
index 77766eb..77766eb 100644
--- a/mtu.c
+++ b/src/mtu.c
diff --git a/netlink.c b/src/netlink.c
index 5e43116..5e43116 100644
--- a/netlink.c
+++ b/src/netlink.c
diff --git a/netlink.h b/src/netlink.h
index 4e2ceb2..4e2ceb2 100644
--- a/netlink.h
+++ b/src/netlink.h
diff --git a/pingu.c b/src/pingu.c
index badd735..badd735 100644
--- a/pingu.c
+++ b/src/pingu.c
diff --git a/pingu.h b/src/pingu.h
index e5906ad..e5906ad 100644
--- a/pingu.h
+++ b/src/pingu.h
diff --git a/pingu_adm.c b/src/pingu_adm.c
index 9062e6e..9062e6e 100644
--- a/pingu_adm.c
+++ b/src/pingu_adm.c
diff --git a/pingu_adm.h b/src/pingu_adm.h
index 3b50b06..3b50b06 100644
--- a/pingu_adm.h
+++ b/src/pingu_adm.h
diff --git a/pingu_burst.c b/src/pingu_burst.c
index 3505c94..3505c94 100644
--- a/pingu_burst.c
+++ b/src/pingu_burst.c
diff --git a/pingu_burst.h b/src/pingu_burst.h
index 6e3b5e6..6e3b5e6 100644
--- a/pingu_burst.h
+++ b/src/pingu_burst.h
diff --git a/pingu_conf.c b/src/pingu_conf.c
index 263a1f4..263a1f4 100644
--- a/pingu_conf.c
+++ b/src/pingu_conf.c
diff --git a/pingu_conf.h b/src/pingu_conf.h
index 37c932a..37c932a 100644
--- a/pingu_conf.h
+++ b/src/pingu_conf.h
diff --git a/pingu_host.c b/src/pingu_host.c
index f7695c4..f7695c4 100644
--- a/pingu_host.c
+++ b/src/pingu_host.c
diff --git a/pingu_host.h b/src/pingu_host.h
index 4f4c341..4f4c341 100644
--- a/pingu_host.h
+++ b/src/pingu_host.h
diff --git a/pingu_iface.c b/src/pingu_iface.c
index 815b1e9..815b1e9 100644
--- a/pingu_iface.c
+++ b/src/pingu_iface.c
diff --git a/pingu_iface.h b/src/pingu_iface.h
index cab98fd..cab98fd 100644
--- a/pingu_iface.h
+++ b/src/pingu_iface.h
diff --git a/pingu_netlink.c b/src/pingu_netlink.c
index d149275..d149275 100644
--- a/pingu_netlink.c
+++ b/src/pingu_netlink.c
diff --git a/pingu_netlink.h b/src/pingu_netlink.h
index 9d99a17..9d99a17 100644
--- a/pingu_netlink.h
+++ b/src/pingu_netlink.h
diff --git a/pingu_ping.c b/src/pingu_ping.c
index 186673e..186673e 100644
--- a/pingu_ping.c
+++ b/src/pingu_ping.c
diff --git a/pingu_ping.h b/src/pingu_ping.h
index e0bda08..e0bda08 100644
--- a/pingu_ping.h
+++ b/src/pingu_ping.h
diff --git a/pingu_route.c b/src/pingu_route.c
index a2462c1..a2462c1 100644
--- a/pingu_route.c
+++ b/src/pingu_route.c
diff --git a/pingu_route.h b/src/pingu_route.h
index bd4abf9..bd4abf9 100644
--- a/pingu_route.h
+++ b/src/pingu_route.h
diff --git a/pinguctl.c b/src/pinguctl.c
index 02dbe14..02dbe14 100644
--- a/pinguctl.c
+++ b/src/pinguctl.c
diff --git a/sockaddr_util.c b/src/sockaddr_util.c
index 57487c1..57487c1 100644
--- a/sockaddr_util.c
+++ b/src/sockaddr_util.c
diff --git a/sockaddr_util.h b/src/sockaddr_util.h
index e716f96..e716f96 100644
--- a/sockaddr_util.h
+++ b/src/sockaddr_util.h
diff --git a/xlib.c b/src/xlib.c
index 0bc8123..0bc8123 100644
--- a/xlib.c
+++ b/src/xlib.c
diff --git a/xlib.h b/src/xlib.h
index a66a6bd..a66a6bd 100644
--- a/xlib.h
+++ b/src/xlib.h