reassemble_test now requires mark_frame_as_depended_upon(), so it
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Tue, 28 Feb 2012 07:06:59 +0000 (07:06 +0000)
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Tue, 28 Feb 2012 07:06:59 +0000 (07:06 +0000)
requires packet.c.  (If it requires any more, we should just make it
link with libwireshark in its entirety.)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41219 f5534014-38df-0310-8fa8-9805f1628bb7

epan/Makefile.am
epan/Makefile.nmake

index ef204dd..ccbd6e7 100644 (file)
@@ -153,7 +153,7 @@ libwireshark_la_DEPENDENCIES = \
 #EXTRA_PROGRAMS = reassemble_test
 #reassemble_test_LDADD = $(GLIB_LIBS)
 
-reassemble_test: reassemble_test.o tvbuff.o except.o to_str.o strutil.o emem.o \
+reassemble_test: reassemble_test.o packet.o tvbuff.o except.o to_str.o strutil.o emem.o \
                  reassemble.o charsets.o
        $(LINK) $^ $(GLIB_LIBS) -lz
 
index 4ed1df8..a554cad 100644 (file)
@@ -253,6 +253,7 @@ tvbtest.exe: $(TVBTEST_OBJ)
 
 # Object files for reassemble_test
 REASSEMBLE_TEST_OBJ=reassemble_test.obj \
+       packet.obj \
        tvbuff.obj \
        except.obj \
        to_str.obj \