osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

More test-programs autotoolizing 

Change-Id: I3e16dc8c591352f19bba190d84a6ed3fe431e21f
Reviewed-on: https://code.wireshark.org/review/14926
Reviewed-by: João Valverde <j@v6e.pt>
This commit is contained in:
João Valverde 2016-03-03 21:32:53 +00:00 committed by João Valverde
parent 597343bcf4
commit 173ccf7a46
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
epan/Makefile.am
View File

@ -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
test-programs: $(EXTRA_PROGRAMS) exntest
cd wmem && $(MAKE) $@
exntest_LDADD = $(GLIB_LIBS)
test-programs: $(EXTRA_PROGRAMS)
$(MAKE) -C wmem $@
diam_dict_lex.h: diam_dict.c

4
epan/wmem/Makefile.am
View File

@ -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: