build: moved front-end source into ui subdir

Cleaned up the directory structure.

Moved the source to the main mtr executable into the ui/ subdirectory.

Moved mtr.bat and mangen.sh into build-aux/

Moved the man pages into man/

Fixed a few omissions in Makefile.am for 'make dist'

diff --git a/Makefile.am b/Makefile.am
index a24c643e573de4869ed126678ba75413fc707051..ba8299c3677b23735480e825296fcc045aacf0a1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 EXTRA_DIST = \
        BSDCOPYING \
        SECURITY \
-       mtr.bat \
+       build-aux/mtr.bat \
        img/mtr_icon.xpm
        $(TEST_FILES)
 
@@ -14,6 +14,7 @@ TESTS = \
 TEST_FILES = \
        test/cmdparse.py \
        test/mtrpacket.py \
+       test/param.py \
        test/probe.py \
        test/lint.sh
 EXTRA_DIST += $(TEST_FILES)
@@ -26,37 +27,37 @@ EXTRA_DIST += $(PATHFILES:=.in)
 #  We would use % pattern matching here, but that is a GNU make
 #  extension and doesn't work on FreeBSD.
 #
-mtr-packet.8: $(srcdir)/mtr-packet.8.in
-       $(AM_V_GEN) $(srcdir)/mangen.sh "$(VERSION)" \
-               $(srcdir)/mtr-packet.8.in $@
+mtr-packet.8: $(srcdir)/man/mtr-packet.8.in
+       $(AM_V_GEN) $(srcdir)/build-aux/mangen.sh "$(VERSION)" \
+               $(srcdir)/man/mtr-packet.8.in $@
 
-mtr.8: $(srcdir)/mtr.8.in
-       $(AM_V_GEN) $(srcdir)/mangen.sh "$(VERSION)" \
-               $(srcdir)/mtr.8.in $@
+mtr.8: $(srcdir)/man/mtr.8.in
+       $(AM_V_GEN) $(srcdir)/build-aux/mangen.sh "$(VERSION)" \
+               $(srcdir)/man/mtr.8.in $@
 
 $(PATHFILES): Makefile
 
 dist_man_MANS = mtr.8 mtr-packet.8
-PATHFILES += mtr.8 mtr-packet.8
+PATHFILES += man/mtr.8 man/mtr-packet.8
 
 install-exec-hook: 
        `setcap cap_net_raw+ep $(DESTDIR)$(sbindir)/mtr-packet` \
        || chmod u+s $(DESTDIR)$(sbindir)/mtr-packet
 
-mtr_SOURCES = mtr.c mtr.h \
-              net.c net.h \
-              cmdpipe.c cmdpipe.h \
-              dns.c dns.h \
-              raw.c raw.h \
-              split.c split.h \
-              display.c display.h \
-              report.c report.h \
-              select.c select.h \
-              utils.c utils.h \
+mtr_SOURCES = ui/mtr.c ui/mtr.h \
+              ui/net.c ui/net.h \
+              ui/cmdpipe.c ui/cmdpipe.h \
+              ui/dns.c ui/dns.h \
+              ui/raw.c ui/raw.h \
+              ui/split.c ui/split.h \
+              ui/display.c ui/display.h \
+              ui/report.c ui/report.h \
+              ui/select.c ui/select.h \
+              ui/utils.c ui/utils.h \
               packet/cmdparse.c packet/cmdparse.h \
-              mtr-curses.h \
+              ui/mtr-curses.h \
               img/mtr_icon.xpm \
-              mtr-gtk.h
+              ui/mtr-gtk.h
 
 if WITH_ERROR
 mtr_SOURCES += \
@@ -72,15 +73,15 @@ mtr_SOURCES += \
 endif
 
 if WITH_IPINFO
-mtr_SOURCES += asn.c asn.h
+mtr_SOURCES += ui/asn.c ui/asn.h
 endif
 
 if WITH_NCURSES
-mtr_SOURCES += curses.c
+mtr_SOURCES += ui/curses.c
 endif
 
 if WITH_GTK
-mtr_SOURCES += gtk.c
+mtr_SOURCES += ui/gtk.c
 endif
 
 mtr_INCLUDES = $(GLIB_CFLAGS) -I$(top_builddir) -I$(top_srcdir)
@@ -89,6 +90,7 @@ mtr_LDADD = $(GTK_LIBS) $(NCURSES_LIBS) $(RESOLV_LIBS)
 
 
 mtr_packet_SOURCES = \
+       portability/queue.h \
        packet/packet.c \
        packet/cmdparse.c packet/cmdparse.h \
        packet/command.c packet/command.h \
@@ -110,7 +112,7 @@ mtr_packet_SOURCES += \
 mtr_packet_LDADD += -lcygwin -liphlpapi -lws2_32
 
 dist_windows_aux = \
-       $(srcdir)/mtr.bat \
+       $(srcdir)/build-aux/mtr.bat \
        $(srcdir)/AUTHORS \
        $(srcdir)/BSDCOPYING \
        $(srcdir)/COPYING \

diff --git a/mangen.sh b/build-aux/mangen.sh
similarity index 100%
rename from mangen.sh
rename to build-aux/mangen.sh

diff --git a/mtr.bat b/build-aux/mtr.bat
similarity index 100%
rename from mtr.bat
rename to build-aux/mtr.bat

diff --git a/configure.ac b/configure.ac
index 25d9179b293e368d4c1a4ce51a0cc2a1fffd269a..116a59435c4db300f5a504e2b730d3169f945b20 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_INIT([mtr],
   [m4_esyscmd([build-aux/git-version-gen .tarball-version])],
   [R.E.Wolff@BitWizard.nl], [],
   [http://www.BitWizard.nl/mtr/])
-AC_CONFIG_SRCDIR([mtr.c])
+AC_CONFIG_SRCDIR([ui/mtr.c])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_USE_SYSTEM_EXTENSIONS
 AM_INIT_AUTOMAKE([

diff --git a/mtr-packet.8.in b/man/mtr-packet.8.in
similarity index 100%
rename from mtr-packet.8.in
rename to man/mtr-packet.8.in

diff --git a/mtr.8.in b/man/mtr.8.in
similarity index 100%
rename from mtr.8.in
rename to man/mtr.8.in

diff --git a/asn.c b/ui/asn.c
similarity index 100%
rename from asn.c
rename to ui/asn.c

diff --git a/asn.h b/ui/asn.h
similarity index 100%
rename from asn.h
rename to ui/asn.h

diff --git a/cmdpipe.c b/ui/cmdpipe.c
similarity index 100%
rename from cmdpipe.c
rename to ui/cmdpipe.c

diff --git a/cmdpipe.h b/ui/cmdpipe.h
similarity index 100%
rename from cmdpipe.h
rename to ui/cmdpipe.h

diff --git a/curses.c b/ui/curses.c
similarity index 100%
rename from curses.c
rename to ui/curses.c

diff --git a/display.c b/ui/display.c
similarity index 100%
rename from display.c
rename to ui/display.c

diff --git a/display.h b/ui/display.h
similarity index 100%
rename from display.h
rename to ui/display.h

diff --git a/dns.c b/ui/dns.c
similarity index 100%
rename from dns.c
rename to ui/dns.c

diff --git a/dns.h b/ui/dns.h
similarity index 100%
rename from dns.h
rename to ui/dns.h

diff --git a/gtk.c b/ui/gtk.c
similarity index 100%
rename from gtk.c
rename to ui/gtk.c

diff --git a/mtr-curses.h b/ui/mtr-curses.h
similarity index 100%
rename from mtr-curses.h
rename to ui/mtr-curses.h

diff --git a/mtr-gtk.h b/ui/mtr-gtk.h
similarity index 100%
rename from mtr-gtk.h
rename to ui/mtr-gtk.h

diff --git a/mtr.c b/ui/mtr.c
similarity index 100%
rename from mtr.c
rename to ui/mtr.c

diff --git a/mtr.h b/ui/mtr.h
similarity index 100%
rename from mtr.h
rename to ui/mtr.h

diff --git a/net.c b/ui/net.c
similarity index 100%
rename from net.c
rename to ui/net.c

diff --git a/net.h b/ui/net.h
similarity index 100%
rename from net.h
rename to ui/net.h

diff --git a/raw.c b/ui/raw.c
similarity index 100%
rename from raw.c
rename to ui/raw.c

diff --git a/raw.h b/ui/raw.h
similarity index 100%
rename from raw.h
rename to ui/raw.h

diff --git a/report.c b/ui/report.c
similarity index 100%
rename from report.c
rename to ui/report.c

diff --git a/report.h b/ui/report.h
similarity index 100%
rename from report.h
rename to ui/report.h

diff --git a/select.c b/ui/select.c
similarity index 100%
rename from select.c
rename to ui/select.c

diff --git a/select.h b/ui/select.h
similarity index 100%
rename from select.h
rename to ui/select.h

diff --git a/split.c b/ui/split.c
similarity index 100%
rename from split.c
rename to ui/split.c

diff --git a/split.h b/ui/split.h
similarity index 100%
rename from split.h
rename to ui/split.h

diff --git a/utils.c b/ui/utils.c
similarity index 100%
rename from utils.c
rename to ui/utils.c

diff --git a/utils.h b/ui/utils.h
similarity index 100%
rename from utils.h
rename to ui/utils.h