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

Fix the win32 nmake generation for now (it will compile/link/run again). This will need more cleanup if the movements of the dissector sources are finished. Hopefully this doesn't broke the unix build. 

svn path=/trunk/; revision=11423
This commit is contained in:
Ulf Lamping 2004-07-18 23:46:07 +00:00
parent fd24ad7d92
commit 5c008e38ba
3 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.nmake
View File

@ -32,6 +32,9 @@ include epan\Makefile.common
BUILT_SOURCES = $(BUILT_SOURCES) \
svnversion.h
DISSECTOR_SUPPORT_SRC = $(DISSECTOR_SUPPORT_SRC:../=)
DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_SRC:.c=.obj)
DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_OBJECTS:../=)
ethereal_OBJECTS = $(ethereal_SOURCES:.c=.obj)
tethereal_OBJECTS = $(tethereal_SOURCES:.c=.obj)
@ -323,7 +326,7 @@ gtk2:: help config.h svnversion.h AUTHORS-SHORT
$(MAKE) /$(MAKEFLAGS) /f Makefile.nmake GTK_CFLAGS="$(GTK2_CFLAGS)" GTK_LIBS="$(GTK2_LIBS)" libui.lib
cd ..
epan:: $(RESOURCES) doxygen
epan:: $(DISSECTOR_SUPPORT_OBJECTS) $(EXTRA_OBJECTS) $(RESOURCES) doxygen
cd epan
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
cd ..

23
epan/Makefile.nmake
View File

@ -57,6 +57,17 @@ OBJECTS=addr_and_mask.obj \
tvbuff.obj \
value_string.obj
EXTRA_OBJECTS = \
# snprintf.obj \
# strerror.obj \
../mkstemp.obj \
../strptime.obj
#EXTRA_SRC = $(EXTRA_SRC:../=)
#EXTRA_OBJECTS = $(EXTRA_SRC:.c=.obj)
!IFDEF ENABLE_LIBETHEREAL
all: ftypes dfilter dissectors libethereal.dll
!ELSE
@ -67,16 +78,20 @@ all: ftypes dfilter dissectors ethereal.lib
libethereal.lib: libethereal.dll
libethereal.exp: libethereal.dll
libethereal.dll: ..\config.h $(OBJECTS) libethereal.def ftypes dfilter dissectors doxygen ..\image\libethereal.res
#DISSECTOR_SUPPORT_SRC = $(DISSECTOR_SUPPORT_SRC:../=)
DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_SRC:.c=.obj)
libethereal.dll: ..\config.h $(OBJECTS) libethereal.def ftypes dfilter dissectors $(DISSECTOR_SUPPORT_OBJECTS) doxygen $(EXTRA_OBJECTS) ..\image\libethereal.res
echo libethereal.dll
$(link) $(dlllflags) $(conlibsdll) \
$(LOCAL_LDFLAGS) \
/DEF:libethereal.def /OUT:libethereal.dll \
/IMPLIB:libethereal.lib $(OBJECTS) $(libethereal_LIBS) \
..\image\libethereal.res \
..\image\libethereal.res dissectors\register.obj \
$(DISSECTOR_SUPPORT_OBJECTS) $(EXTRA_OBJECTS)
ethereal.lib : ..\config.h $(OBJECTS)
link /lib /out:ethereal.lib $(OBJECTS)
link /lib /out:ethereal.lib $(OBJECTS) $(EXTRA_OBJECTS)
..\config.h : ..\config.h.win32 ..\config.nmake
cd ..

10
epan/dissectors/Makefile.nmake
View File

@ -21,12 +21,10 @@ CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
#DISSECTOR_SRC = $(DISSECTOR_SRC:../=)
DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
DISSECTOR_SUPPORT_SRC = $(DISSECTOR_SUPPORT_SRC:../../=)
DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_SRC:.c=.obj)
#dissectors.lib: ../../config.h $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) $(EXTRA_OBJECTS)
dissectors.lib: register.obj packet-ncp2222.c x11-declarations.h x11-register-info.h ../../config.h $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS)
link /lib /out:dissectors.lib $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS)
#dissectors.lib: ../../config.h $(DISSECTOR_OBJECTS) $(EXTRA_OBJECTS)
dissectors.lib: register.obj packet-ncp2222.c x11-declarations.h x11-register-info.h ../../config.h $(DISSECTOR_OBJECTS)
echo dissectors.lib
link /lib /out:dissectors.lib $(DISSECTOR_OBJECTS)
#
# The header files listed here are built from x11-fields using Perl;