diff options
| -rw-r--r-- | epan/Makefile.am | 16 | ||||
| -rw-r--r-- | epan/wmem/Makefile.am | 4 |
2 files changed, 9 insertions, 11 deletions
diff --git a/epan/Makefile.am b/epan/Makefile.am index 25c4eec0f5..a7af0d83a2 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -86,11 +86,7 @@ EXTRA_DIST = \ Makefile.common \ Makefile.nmake \ radius_dict.l \ - tvbtest.c \ - reassemble_test.c \ uat_load.l \ - exntest.c \ - oids_test.c \ doxygen.cfg.in \ CMakeLists.txt \ print.ps @@ -160,7 +156,8 @@ libwireshark_la_DEPENDENCIES = \ ${top_builddir}/wsutil/libwsutil.la \ ${top_builddir}/wiretap/libwiretap.la -EXTRA_PROGRAMS = reassemble_test tvbtest oids_test +EXTRA_PROGRAMS = reassemble_test tvbtest oids_test exntest + reassemble_test_LDADD = \ libwireshark.la \ $(GLIB_LIBS) \ @@ -176,11 +173,12 @@ oids_test_LDADD = \ $(GLIB_LIBS) \ -lz -exntest: exntest.o except.o - $(LINK) $^ $(GLIB_LIBS) +exntest_SOURCES = exntest.c except.c + +exntest_LDADD = $(GLIB_LIBS) -test-programs: $(EXTRA_PROGRAMS) exntest - cd wmem && $(MAKE) $@ +test-programs: $(EXTRA_PROGRAMS) + $(MAKE) -C wmem $@ diam_dict_lex.h: diam_dict.c diff --git a/epan/wmem/Makefile.am b/epan/wmem/Makefile.am index d9190c92ef..6d001fb865 100644 --- a/epan/wmem/Makefile.am +++ b/epan/wmem/Makefile.am @@ -27,7 +27,8 @@ AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(LIBWMEM_CFLAGS) \ noinst_LTLIBRARIES = libwmem.la -noinst_PROGRAMS = wmem_test +EXTRA_PROGRAMS = wmem_test + wmem_test_LDADD = \ libwmem.la \ $(GLIB_LIBS) @@ -51,7 +52,6 @@ libwmem_la_SOURCES = \ EXTRA_DIST = \ Makefile.common \ Makefile.nmake \ - wmem_test.c \ CMakeLists.txt checkapi: |