From b9437b91614638f23c663db96d336d45a03d7ecb Mon Sep 17 00:00:00 2001 From: Matt Kimball Date: Sun, 25 Dec 2016 09:45:52 -0800 Subject: [PATCH] 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' --- Makefile.am | 50 +++++++++++++------------- mangen.sh => build-aux/mangen.sh | 0 mtr.bat => build-aux/mtr.bat | 0 configure.ac | 2 +- mtr-packet.8.in => man/mtr-packet.8.in | 0 mtr.8.in => man/mtr.8.in | 0 asn.c => ui/asn.c | 0 asn.h => ui/asn.h | 0 cmdpipe.c => ui/cmdpipe.c | 0 cmdpipe.h => ui/cmdpipe.h | 0 curses.c => ui/curses.c | 0 display.c => ui/display.c | 0 display.h => ui/display.h | 0 dns.c => ui/dns.c | 0 dns.h => ui/dns.h | 0 gtk.c => ui/gtk.c | 0 mtr-curses.h => ui/mtr-curses.h | 0 mtr-gtk.h => ui/mtr-gtk.h | 0 mtr.c => ui/mtr.c | 0 mtr.h => ui/mtr.h | 0 net.c => ui/net.c | 0 net.h => ui/net.h | 0 raw.c => ui/raw.c | 0 raw.h => ui/raw.h | 0 report.c => ui/report.c | 0 report.h => ui/report.h | 0 select.c => ui/select.c | 0 select.h => ui/select.h | 0 split.c => ui/split.c | 0 split.h => ui/split.h | 0 utils.c => ui/utils.c | 0 utils.h => ui/utils.h | 0 32 files changed, 27 insertions(+), 25 deletions(-) rename mangen.sh => build-aux/mangen.sh (100%) rename mtr.bat => build-aux/mtr.bat (100%) rename mtr-packet.8.in => man/mtr-packet.8.in (100%) rename mtr.8.in => man/mtr.8.in (100%) rename asn.c => ui/asn.c (100%) rename asn.h => ui/asn.h (100%) rename cmdpipe.c => ui/cmdpipe.c (100%) rename cmdpipe.h => ui/cmdpipe.h (100%) rename curses.c => ui/curses.c (100%) rename display.c => ui/display.c (100%) rename display.h => ui/display.h (100%) rename dns.c => ui/dns.c (100%) rename dns.h => ui/dns.h (100%) rename gtk.c => ui/gtk.c (100%) rename mtr-curses.h => ui/mtr-curses.h (100%) rename mtr-gtk.h => ui/mtr-gtk.h (100%) rename mtr.c => ui/mtr.c (100%) rename mtr.h => ui/mtr.h (100%) rename net.c => ui/net.c (100%) rename net.h => ui/net.h (100%) rename raw.c => ui/raw.c (100%) rename raw.h => ui/raw.h (100%) rename report.c => ui/report.c (100%) rename report.h => ui/report.h (100%) rename select.c => ui/select.c (100%) rename select.h => ui/select.h (100%) rename split.c => ui/split.c (100%) rename split.h => ui/split.h (100%) rename utils.c => ui/utils.c (100%) rename utils.h => ui/utils.h (100%) diff --git a/Makefile.am b/Makefile.am index a24c643..ba8299c 100644 --- 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 25d9179..116a594 100644 --- 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 -- 2.47.2