diff options
| -rw-r--r-- | Makefile.am | 14 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | echld/Makefile.am | 3 | ||||
| -rw-r--r-- | echld/Makefile.common | 8 | ||||
| -rw-r--r-- | echld/child.c (renamed from echld/echld_child.c) | 0 | ||||
| -rw-r--r-- | echld/common.c (renamed from echld/echld_common.c) | 0 | ||||
| -rw-r--r-- | echld/dispatcher.c (renamed from echld/echld_dispatcher.c) | 0 | ||||
| -rw-r--r-- | echld/parent.c (renamed from echld/echld_parent.c) | 0 | ||||
| -rw-r--r-- | echld_test.c | 2 |
9 files changed, 17 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am index 69349653e3..913697d53e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -550,6 +550,10 @@ echld_test_LDADD = \ @C_ARES_LIBS@ \ @ADNS_LIBS@ +echld_test_DEPENDENCIES = \ + echld/libechld.la \ + epan/libwireshark.la + echld_test_CFLAGS = $(AM_CLEAN_CFLAGS) @@ -1027,15 +1031,9 @@ endif DIST_SUBDIRS = asn1 codecs doc epan echld ui ui/cli ui/gtk ui/qt help packaging plugins tools wiretap wsutil docbook if HAVE_PLUGINS -SDIRS = tools wsutil wiretap epan plugins packaging help ui @wireshark_SUBDIRS@ ui/cli . doc -else -SDIRS = tools wsutil wiretap epan packaging help ui @wireshark_SUBDIRS@ ui/cli . doc -endif - -if HAVE_ECHLD -SUBDIRS = echld $(SDIRS) +SUBDIRS = tools wsutil wiretap epan @echld_dir@ plugins packaging help ui @wireshark_SUBDIRS@ ui/cli . doc else -SUBDIRS = $(SDIRS) +SUBDIRS = tools wsutil wiretap epan @echld_dir@ packaging help ui @wireshark_SUBDIRS@ ui/cli . doc endif help/faq.txt: $(srcdir)/help/faq.py diff --git a/configure.ac b/configure.ac index b914b7ede5..29e5cf0ccc 100644 --- a/configure.ac +++ b/configure.ac @@ -1473,11 +1473,14 @@ if test "x$have_echld" = xyes then AC_DEFINE(HAVE_ECHLD, 1, [Define if echld is enabled]) echld_test_bin="echld_test\$(EXEEXT)" + echld_dir="echld" else have_echld="no" echld_test_bin="" + echld_dir="" fi AC_SUBST(echld_test_bin) +AC_SUBST(echld_dir) # Enabling/disabling of dumpcap is done later (after we know if we have PCAP diff --git a/echld/Makefile.am b/echld/Makefile.am index 8f0c58463b..4affaf8d74 100644 --- a/echld/Makefile.am +++ b/echld/Makefile.am @@ -50,6 +50,9 @@ libechld_la_SOURCES = \ $(LIBECHLD_INCLUDES) libechld_la_DEPENDENCIES= + ../epan/libwireshark.la \ + ../wsutil/libwsutil.la + libechld_la_LIBADD = \ ../epan/libwireshark.la \ diff --git a/echld/Makefile.common b/echld/Makefile.common index f8004280e3..902caa7828 100644 --- a/echld/Makefile.common +++ b/echld/Makefile.common @@ -30,10 +30,10 @@ # _SOURCES variables). LIBECHLD_SRC = \ echld-util.c \ - echld_dispatcher.c \ - echld_child.c \ - echld_parent.c \ - echld_common.c + dispatcher.c \ + child.c \ + parent.c \ + common.c # Header files that are not generated from other files LIBECHLD_INCLUDES = \ diff --git a/echld/echld_child.c b/echld/child.c index b603d3464a..b603d3464a 100644 --- a/echld/echld_child.c +++ b/echld/child.c diff --git a/echld/echld_common.c b/echld/common.c index c078af5fd7..c078af5fd7 100644 --- a/echld/echld_common.c +++ b/echld/common.c diff --git a/echld/echld_dispatcher.c b/echld/dispatcher.c index 53dbbda9d7..53dbbda9d7 100644 --- a/echld/echld_dispatcher.c +++ b/echld/dispatcher.c diff --git a/echld/echld_parent.c b/echld/parent.c index e74125abf3..e74125abf3 100644 --- a/echld/echld_parent.c +++ b/echld/parent.c diff --git a/echld_test.c b/echld_test.c index 3604c46028..ccf7c73be9 100644 --- a/echld_test.c +++ b/echld_test.c @@ -71,7 +71,7 @@ int main(int argc, char** argv) { struct timeval tv; int tot_cycles = 0; int npings; - GString* str = g_string_new(""); +// GString* str = g_string_new(""); tv.tv_sec = 0; tv.tv_usec = 250000; |