Add LIBETHEREAL_SRC and LIBETHEREAL_INCLUDES to epan/Makefile.common,
and have epan/Makefile.am and epan/Makefile.nmake use them. svn path=/trunk/; revision=11641
This commit is contained in:
Guy Harris
parent
e7fbdca940
commit
9d81b834d7
|
|
@ -37,64 +37,8 @@ include Makefile.common
|
|||
INCLUDES = -I$(srcdir)/..
|
||||
|
||||
libethereal_la_SOURCES = \
|
||||
addr_and_mask.c \
|
||||
addr_and_mask.h \
|
||||
addr_resolv.c \
|
||||
addr_resolv.h \
|
||||
address.h \
|
||||
atalk-utils.c \
|
||||
atalk-utils.h \
|
||||
bitswap.c \
|
||||
bitswap.h \
|
||||
circuit.c \
|
||||
circuit.h \
|
||||
column_info.h \
|
||||
conversation.c \
|
||||
conversation.h \
|
||||
column-utils.c \
|
||||
column-utils.h \
|
||||
epan.c \
|
||||
epan.h \
|
||||
epan_dissect.h \
|
||||
except.c \
|
||||
except.h \
|
||||
exceptions.h \
|
||||
filesystem.c \
|
||||
filesystem.h \
|
||||
frame_data.c \
|
||||
frame_data.h \
|
||||
gdebug.h \
|
||||
int-64bit.c \
|
||||
int-64bit.h \
|
||||
ipv4.c \
|
||||
ipv4.h \
|
||||
ipv6-utils.h \
|
||||
nstime.h \
|
||||
osi-utils.c \
|
||||
osi-utils.h \
|
||||
packet.c \
|
||||
packet.h \
|
||||
packet_info.h \
|
||||
pint.h \
|
||||
plugins.c \
|
||||
plugins.h \
|
||||
proto.c \
|
||||
proto.h \
|
||||
report_err.h \
|
||||
slab.h \
|
||||
sna-utils.c \
|
||||
sna-utils.h \
|
||||
strutil.c \
|
||||
strutil.h \
|
||||
timestamp.c \
|
||||
timestamp.h \
|
||||
to_str.c \
|
||||
to_str.h \
|
||||
tvbuff.c \
|
||||
tvbuff.h \
|
||||
value_string.c \
|
||||
value_string.h \
|
||||
$(DISSECTOR_SRC) \
|
||||
$(LIBETHEREAL_SRC) \
|
||||
$(LIBETHEREAL_INCLUDES) \
|
||||
$(DISSECTOR_SUPPORT_SRC)
|
||||
|
||||
EXTRA_libethereal_la_SOURCES = \
|
||||
|
|
|
|||
|
|
@ -23,7 +23,66 @@
|
|||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
LIBETHEREAL_SRC = \
|
||||
addr_and_mask.c \
|
||||
addr_resolv.c \
|
||||
atalk-utils.c \
|
||||
bitswap.c \
|
||||
circuit.c \
|
||||
column-utils.c \
|
||||
conversation.c \
|
||||
epan.c \
|
||||
except.c \
|
||||
filesystem.c \
|
||||
frame_data.c \
|
||||
int-64bit.c \
|
||||
ipv4.c \
|
||||
osi-utils.c \
|
||||
packet.c \
|
||||
plugins.c \
|
||||
proto.c \
|
||||
sna-utils.c \
|
||||
strutil.c \
|
||||
timestamp.c \
|
||||
to_str.c \
|
||||
tvbuff.c \
|
||||
value_string.c
|
||||
|
||||
LIBETHEREAL_INCLUDESS = \
|
||||
addr_and_mask.h \
|
||||
addr_resolv.h \
|
||||
address.h \
|
||||
atalk-utils.h \
|
||||
bitswap.h \
|
||||
circuit.h \
|
||||
column_info.h \
|
||||
conversation.h \
|
||||
column-utils.h \
|
||||
epan.h \
|
||||
epan_dissect.h \
|
||||
except.h \
|
||||
exceptions.h \
|
||||
filesystem.h \
|
||||
frame_data.h \
|
||||
gdebug.h \
|
||||
int-64bit.h \
|
||||
ipv4.h \
|
||||
ipv6-utils.h \
|
||||
nstime.h \
|
||||
osi-utils.h \
|
||||
packet.h \
|
||||
packet_info.h \
|
||||
pint.h \
|
||||
plugins.h \
|
||||
proto.h \
|
||||
report_err.h \
|
||||
slab.h \
|
||||
sna-utils.h \
|
||||
strutil.h \
|
||||
timestamp.h \
|
||||
to_str.h \
|
||||
tvbuff.h \
|
||||
value_string.h
|
||||
|
||||
# dissector helpers (needed from the dissectors, but not a dissector itself)
|
||||
DISSECTOR_SUPPORT_SRC = \
|
||||
|
|
|
|||
|
|
@ -33,37 +33,14 @@ DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_SRC:.c=.obj)
|
|||
.c.obj::
|
||||
$(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<
|
||||
|
||||
OBJECTS=addr_and_mask.obj \
|
||||
addr_resolv.obj \
|
||||
atalk-utils.obj \
|
||||
bitswap.obj \
|
||||
circuit.obj \
|
||||
column-utils.obj \
|
||||
conversation.obj \
|
||||
epan.obj \
|
||||
except.obj \
|
||||
filesystem.obj \
|
||||
frame_data.obj \
|
||||
inet_aton.obj \
|
||||
inet_pton.obj \
|
||||
inet_ntop.obj \
|
||||
ipv4.obj \
|
||||
int-64bit.obj \
|
||||
osi-utils.obj \
|
||||
packet.obj \
|
||||
plugins.obj \
|
||||
proto.obj \
|
||||
sna-utils.obj \
|
||||
strutil.obj \
|
||||
timestamp.obj \
|
||||
to_str.obj \
|
||||
tvbuff.obj \
|
||||
value_string.obj
|
||||
|
||||
LIBETHEREAL_OBJECTS = $(LIBETHERAL_SRC:.c=.obj)
|
||||
|
||||
EXTRA_OBJECTS = \
|
||||
# snprintf.obj \
|
||||
# strerror.obj \
|
||||
inet_aton.obj \
|
||||
inet_pton.obj \
|
||||
inet_ntop.obj \
|
||||
../mkstemp.obj \
|
||||
../strptime.obj
|
||||
|
||||
|
|
@ -90,12 +67,14 @@ libethereal.dll: ..\config.h $(OBJECTS) libethereal.def ftypes dfilter dissector
|
|||
$(link) $(dlllflags) $(conlibsdll) \
|
||||
$(LOCAL_LDFLAGS) \
|
||||
/DEF:libethereal.def /OUT:libethereal.dll \
|
||||
/IMPLIB:libethereal.lib $(OBJECTS) $(libethereal_LIBS) \
|
||||
..\image\libethereal.res dissectors\register.obj \
|
||||
$(DISSECTOR_SUPPORT_OBJECTS) $(EXTRA_OBJECTS)
|
||||
/IMPLIB:libethereal.lib $(LIBETHEREAL_OBJECTS) \
|
||||
$(libethereal_LIBS) ..\image\libethereal.res \
|
||||
dissectors\register.obj $(DISSECTOR_SUPPORT_OBJECTS) \
|
||||
$(EXTRA_OBJECTS)
|
||||
|
||||
ethereal.lib : ..\config.h $(OBJECTS)
|
||||
link /lib /out:ethereal.lib $(OBJECTS) $(EXTRA_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS)
|
||||
ethereal.lib : ..\config.h $(LIBETHEREAL_OBJECTS)
|
||||
link /lib /out:ethereal.lib $(LIBETHEREAL_OBJECTS) \
|
||||
$(EXTRA_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS)
|
||||
|
||||
..\config.h : ..\config.h.win32 ..\config.nmake
|
||||
cd ..
|
||||
|
|
@ -103,7 +82,7 @@ ethereal.lib : ..\config.h $(OBJECTS)
|
|||
cd epan
|
||||
|
||||
clean:
|
||||
rm -f $(OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) $(EXTRA_OBJECTS) ethereal.lib libethereal.dll libethereal.lib libethereal.exp $(PDB_FILE) doxygen.cfg html/*.*
|
||||
rm -f $(LIBETHEREAL_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) $(EXTRA_OBJECTS) ethereal.lib libethereal.dll libethereal.lib libethereal.exp $(PDB_FILE) doxygen.cfg html/*.*
|
||||
if exist html rmdir html
|
||||
cd ftypes
|
||||
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
|
||||
|
|
|
|||
Loading…
Reference in New Issue