- update to Wireshark

[obnox/wireshark/wip.git] / Makefile.nmake

diff --git a/Makefile.nmake b/Makefile.nmake
index e5006d1367f31c54cdfbbe32483adb4670b01447..5ab48184802ec7638904314d64574ee28cddd85f 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -16,7 +16,8 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 CFLAGS=-DHAVE_CONFIG_H $(LOCAL_CFLAGS) $(GLIB_CFLAGS) /I. /Iwiretap \
        $(ZLIB_CFLAGS) /I$(PCAP_DIR)\include \
        /I$(NET_SNMP_DIR)\include /I$(NET_SNMP_DIR)\win32 \
-       $(ADNS_CFLAGS) $(PCRE_CFLAGS) $(GNUTLS_CFLAGS) -D_U_="" -D_NEED_VAR_IMPORT_
+       $(ADNS_CFLAGS) $(PCRE_CFLAGS) $(GNUTLS_CFLAGS) $(LUA_CFLAGS) \
+       -D_U_="" -D_NEED_VAR_IMPORT_
 
 CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
 
@@ -46,8 +47,11 @@ EXTRA_OBJECTS = \
        strptime.obj
 
 ethereal_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
-       wsock32.lib user32.lib shell32.lib \
+       wsock32.lib user32.lib shell32.lib comctl32.lib \
        $(NET_SNMP_DIR)\win32\lib\release\netsnmp.lib \
+!IFDEF HHC_DIR
+       $(HHC_DIR)\lib\htmlhelp.lib \
+!ENDIF
 !IFDEF ENABLE_LIBETHEREAL
        epan\libethereal.lib \
 !ELSE
@@ -178,10 +182,10 @@ capinfos.exe      : config.h capinfos.obj getopt.obj $(command_line_OBJECTS) wiretap\
                /OUT:capinfos.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console capinfos.obj getopt.obj $(command_line_OBJECTS) $(capinfos_LIBS) image\capinfos.res
 <<
 
-editcap.exe    : config.h editcap.obj getopt.obj wiretap\wiretap-$(WTAP_VERSION).lib image\editcap.res
+editcap.exe    : config.h editcap.obj getopt.obj strptime.obj wiretap\wiretap-$(WTAP_VERSION).lib image\editcap.res
        @echo Linking $@
        $(LINK) @<<
-               /OUT:editcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console editcap.obj getopt.obj $(command_line_OBJECTS) $(editcap_LIBS) image\editcap.res
+               /OUT:editcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console editcap.obj getopt.obj strptime.obj $(command_line_OBJECTS) $(editcap_LIBS) image\editcap.res
 <<
 
 mergecap.exe   : config.h svnversion.h mergecap.obj merge.obj getopt.obj $(command_line_OBJECTS) wiretap\wiretap-$(WTAP_VERSION).lib image\mergecap.res
@@ -208,10 +212,10 @@ randpkt.exe       : $(randpkt_OBJECTS) $(command_line_OBJECTS)
                /OUT:randpkt.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(randpkt_LIBS) $(randpkt_OBJECTS) $(command_line_OBJECTS)
 <<
 
-dumpcap.exe    : config.h svnversion.h $(dumpcap_OBJECTS) $(command_line_OBJECTS) mkstemp.obj wiretap\wiretap-$(WTAP_VERSION).lib image\dumpcap.res 
+dumpcap.exe    : config.h svnversion.h $(dumpcap_OBJECTS) getopt.obj mkstemp.obj $(command_line_OBJECTS) wiretap\wiretap-$(WTAP_VERSION).lib image\dumpcap.res 
        @echo Linking $@
        $(LINK) @<<
-               /OUT:dumpcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(dumpcap_LIBS) $(dumpcap_OBJECTS) $(command_line_OBJECTS) mkstemp.obj image\dumpcap.res
+               /OUT:dumpcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(dumpcap_LIBS) $(dumpcap_OBJECTS) getopt.obj mkstemp.obj $(command_line_OBJECTS) image\dumpcap.res
 <<
 
 
@@ -227,7 +231,9 @@ config.h    : config.h.win32 config.nmake
            -e "s/@HAVE_PCAP_DATALINK_VAL_TO_NAME@/$(PCAP_DATALINK_VAL_TO_NAME_CONFIG)/" \
            -e "s/@HAVE_LIBETHEREALDLL@/$(LIBETHEREAL_CONFIG)/" \
            -e "s/@WPCAP_CONSTIFIED@/$(WPCAP_CONSTIFIED_CONFIG)/" \
-               -e "s/@HAVE_GNUTLS@/$(GNUTLS_CONFIG)/" \
+           -e "s/@HAVE_GNUTLS@/$(GNUTLS_CONFIG)/" \
+           -e "s/@HAVE_LUA@/$(LUA_CONFIG)/" \
+           -e "s/@HAVE_LUA_5_1@/$(LUA_VERSION)/" \
            < config.h.win32 > $@
 
 ps.c   : rdps.exe print.ps
@@ -289,6 +295,9 @@ clean: gtk2_distclean
                dftest.obj dftest.exe randpkt.obj randpkt.ext dumpcap.obj \
                doxygen.cfg \
                $(RESOURCES) libethereal.dll wiretap-$(WTAP_VERSION).dll
+       cd asn1
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
+       cd ..
        cd wiretap
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
        cd ../gtk
@@ -505,6 +514,10 @@ setup: verify_tools
        @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
                zlib123-dll zlib123-dll.zip
 !ENDIF
+!IFDEF LUA_DIR
+       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+               . lua5_1_vc6.zip
+!ENDIF
 !IFDEF GTK2_DIR
 !IF "$(GTK2_INST_VERSION)" == "2.8"
        @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
@@ -573,7 +586,7 @@ setup: verify_tools
 !ENDIF
 !IFDEF GTK_WIMP_DIR
        @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
-               gtk-wimp gtk-wimp/gtk-wimp-0.6.2-bin.zip
+               gtk-wimp gtk-wimp/gtk-wimp-0.7.0-bin.zip
 !ENDIF
        @echo.
        @echo Ethereal is ready to build.
@@ -630,6 +643,10 @@ install-gtk2-deps: install-required-deps
 !IFDEF NEED_LIBPNG_DLL
        xcopy $(GTK2_DIR)\bin\libpng13.dll . /d
 !ENDIF
+!IFDEF NEED_CAIRO_DLL
+       xcopy $(GTK2_DIR)\bin\libcairo-2.dll . /d
+       xcopy $(GTK2_DIR)\bin\libpangocairo-1.0-0.dll . /d
+!ENDIF
 !ENDIF
 
 install-gtk1-deps: install-required-deps
@@ -668,4 +685,3 @@ clean-deps:
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean-deps
        cd ..
 
-