diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2015-01-20 20:41:49 -0500 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2015-01-22 02:12:46 +0000 |
| commit | 042623617bf261c5b8409b1efe5bc798ff54312d (patch) | |
| tree | 40e708dd64d528aae24d884d8ceb4583578a7349 /echld/Makefile.common | |
| parent | d93a90b445d1e5821eec32e1e2327d5836188fff (diff) | |
Get us building with the subdir-objects automake option.
subdir-objects will be enabled unconditionally in automake-2.0 and
automake-1.14 gives us warnings about the upcoming change.
Rework I1b3c517f08d3c752ee03cb89482ee4951ceb5bf3 (and
I416f2d3611fb61659b9a7f7285e5f54a354fbe7d) to give wslua/make-reg.pl the directory of
the source files rather than the full path to each.
In echld don't use sources in the top-level directory in libechld: it breaks
distclean with subdir-objects turned on.
Bug: 10648
Change-Id: I404b074f1558376064c35d8fc96aea7e3d042a76
Reviewed-on: https://code.wireshark.org/review/6697
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Diffstat (limited to 'echld/Makefile.common')
| -rw-r--r-- | echld/Makefile.common | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/echld/Makefile.common b/echld/Makefile.common index 1828254c5a..d281f7d1ca 100644 --- a/echld/Makefile.common +++ b/echld/Makefile.common @@ -39,16 +39,3 @@ LIBECHLD_INCLUDES = \ echld-util.h \ echld.h -LIBECHLD_MORE_SRC = \ - ../capture_opts.c \ - ../capture_stop_conditions.c \ - ../cfile.c \ - ../conditions.c \ - ../pcapio.c \ - ../ringbuffer.c \ - ../sync_pipe_write.c - -OTHER = \ - ../dumpcap.c - - |