From 042623617bf261c5b8409b1efe5bc798ff54312d Mon Sep 17 00:00:00 2001 From: Jeff Morriss Date: Tue, 20 Jan 2015 20:41:49 -0500 Subject: 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 Tested-by: Petri Dish Buildbot Reviewed-by: Jeff Morriss --- echld/Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'echld/Makefile.am') diff --git a/echld/Makefile.am b/echld/Makefile.am index ca43609735..1bf4a3a544 100644 --- a/echld/Makefile.am +++ b/echld/Makefile.am @@ -45,8 +45,7 @@ AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/../wiretap libechld_la_SOURCES = \ $(LIBECHLD_SRC) \ - $(LIBECHLD_INCLUDES) \ - $(LIBECHLD_MORE_SRC) + $(LIBECHLD_INCLUDES) libechld_la_DEPENDENCIES = \ -- cgit v1.2.1