!ELSE
epan\dissectors\dissectors.lib \
epan\wireshark.lib \
- epan\dfilter\dfilter.lib epan\ftypes\ftypes.lib \
+ epan\crypt\airpdcap.lib \
+ epan\dfilter\dfilter.lib \
+ epan\ftypes\ftypes.lib \
$(ADNS_LIBS) \
$(PCRE_LIBS) \
$(ZLIB_LIBS) \
!ELSE
epan\dissectors\dissectors.lib \
epan\wireshark.lib \
- epan\dfilter\dfilter.lib epan\ftypes\ftypes.lib \
+ epan\crypt\airpdcap.lib \
+ epan\dfilter\dfilter.lib \
+ epan\ftypes\ftypes.lib \
$(ADNS_LIBS) \
$(PCRE_LIBS) \
$(ZLIB_LIBS) \
image\capinfos.res image\editcap.res image\mergecap.res \
image\text2pcap.res image\wiretap.res image\dumpcap.res
-all: config.h tools image codecs wiretap epan $(EXECUTABLES) $(RESOURCES) doc install-deps
+all: config.h tools image codecs $(ZLIB_DIR)\zlib1.dll wiretap epan $(EXECUTABLES) $(RESOURCES) doc install-deps
packaging: all
cd packaging
cd nsis
- nmake -f makefile.nmake
+ $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
cd ..
cd ..
cd packaging
cd nsis
!IFDEF GTK1_DIR
- nmake -f makefile.nmake GTK1_ONLY="USE"
+ $(MAKE) /$(MAKEFLAGS) -f makefile.nmake GTK1_ONLY="USE"
!ENDIF
!IFDEF GTK2_DIR
- nmake -f makefile.nmake GTK2_ONLY="USE"
+ $(MAKE) /$(MAKEFLAGS) -f makefile.nmake GTK2_ONLY="USE"
!ENDIF
cd ..
cd ..
cd packaging
cd u3
cd win32
- nmake -f makefile.nmake
+ $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
cd ..
cd ..
cd ..
$(RESOURCES): image
-wiretap\wiretap-$(WTAP_VERSION).lib: image wiretap
+wiretap\wiretap-$(WTAP_VERSION).lib: image $(ZLIB_DIR)\zlib1.dll wiretap
!IFNDEF GTK1_DIR
wireshark.exe :
wireshark.exe : config.h svnversion.h $(wireshark_OBJECTS) getopt.obj codecs epan gtk image\wireshark.res wiretap\wiretap-$(WTAP_VERSION).lib codecs\codecs.lib gtk\libui.lib plugins
@echo Linking $@
$(LINK) @<<
- /OUT:wireshark.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /SUBSYSTEM:windows $(wireshark_LIBS) getopt.obj $(GTK1_LIBS) codecs\codecs.lib gtk\libui.lib $(wireshark_OBJECTS) image\wireshark.res
+ /OUT:wireshark.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:windows $(wireshark_LIBS) getopt.obj $(GTK1_LIBS) codecs\codecs.lib gtk\libui.lib $(wireshark_OBJECTS) image\wireshark.res
<<
!ENDIF
wireshark-gtk2.exe : config.h svnversion.h $(wireshark_OBJECTS) getopt.obj codecs epan gtk2 image\wireshark.res wiretap\wiretap-$(WTAP_VERSION).lib codecs\codecs.lib gtk2.tmp\libui.lib plugins
@echo Linking $@
$(LINK) @<<
- /OUT:wireshark-gtk2.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /SUBSYSTEM:windows $(wireshark_LIBS) getopt.obj $(GTK2_LIBS) codecs\codecs.lib gtk2.tmp\libui.lib $(wireshark_OBJECTS) image\wireshark.res
+ /OUT:wireshark-gtk2.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:windows $(wireshark_LIBS) getopt.obj $(GTK2_LIBS) codecs\codecs.lib gtk2.tmp\libui.lib $(wireshark_OBJECTS) image\wireshark.res
<<
!ENDIF
tshark.exe : config.h svnversion.h $(tshark_OBJECTS) getopt.obj epan image\tshark.res wiretap\wiretap-$(WTAP_VERSION).lib plugins
@echo Linking $@
$(LINK) @<<
- /OUT:tshark.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(tshark_LIBS) $(tshark_OBJECTS) getopt.obj image\tshark.res
+ /OUT:tshark.exe $(conflags) $(conlibsdll) $(LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:console $(tshark_LIBS) $(tshark_OBJECTS) getopt.obj image\tshark.res
<<
capinfos.exe : config.h capinfos.obj getopt.obj wiretap\wiretap-$(WTAP_VERSION).lib image\capinfos.res
/OUT:capinfos.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console capinfos.obj getopt.obj $(capinfos_LIBS) image\capinfos.res
<<
-editcap.exe : config.h editcap.obj getopt.obj strptime.obj epan\crypt-md5.obj wiretap\wiretap-$(WTAP_VERSION).lib image\editcap.res
+editcap.exe : config.h editcap.obj getopt.obj strptime.obj epan\crypt\crypt-md5.obj wiretap\wiretap-$(WTAP_VERSION).lib image\editcap.res
@echo Linking $@
$(LINK) @<<
- /OUT:editcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console editcap.obj getopt.obj strptime.obj epan\crypt-md5.obj $(editcap_LIBS) image\editcap.res
+ /OUT:editcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console editcap.obj getopt.obj strptime.obj epan\crypt\crypt-md5.obj $(editcap_LIBS) image\editcap.res
<<
mergecap.exe : config.h svnversion.h mergecap.obj merge.obj getopt.obj wiretap\wiretap-$(WTAP_VERSION).lib image\mergecap.res
-e "s/@HAVE_LUA@/$(LUA_CONFIG)/" \
-e "s/@HAVE_LUA_5_1@/$(LUA_VERSION)/" \
-e "s/@HAVE_AIRPCAP@/$(AIRPCAP_CONFIG)/" \
+ -e "s/@HAVE_AIRPDCAP@/$(AIRPDCAP_CONFIG)/" \
-e "s/@HAVE_LIBPORTAUDIO@/$(PORTAUDIO_CONFIG)/" \
-e "s/@PORTAUDIO_API_1@/$(PORTAUDIO_API_CONFIG)/" \
-e "s/@HAVE_NET_SNMP@/$(NET_SNMP_CONFIG)/" \
- -e "s/@HAVE_SOME_SNMP@/$(SOME_SNMP_CONFIG)/" \
< config.h.win32 > $@
ps.c : rdps.exe print.ps
#
# Build "tshark-tap-register.c", which contains a function
# "register_all_tap_listeners()"
-# that calls the register routines for all tehtereal tap listeners.
+# that calls the register routines for all TShark tap listeners.
#
# We do this by grepping through sources.
#
clean: clean_gtk2.tmp clean-deps
rm -f $(wireshark_OBJECTS) $(tshark_OBJECTS) $(EXTRA_OBJECTS) \
- $(EXECUTABLES) $(PDB_FILE) \
+ $(EXECUTABLES) *.pdb *.exe.manifest \
capinfos.obj editcap.obj mergecap.obj text2pcap.obj getopt.obj\
text2pcap-scanner.obj text2pcap-scanner.c rdps.obj \
rdps.pdb rdps.exe rdps.ilk config.h ps.c AUTHORS-SHORT \
# "distclean" removes all files not part of the distribution.
# It does not remove generated files that are part of the distribution.
distclean: clean
+!IF "$(MSVC_VARIANT)" != "MSVC6"
+ rm -f $(ZLIB_DIR)\zlib1.dll $(ZLIB_DIR)\zlib1.dll.manifest \
+ $(ZLIB_DIR)\include\zlib.h $(ZLIB_DIR)\include\zconf.h \
+ $(ZLIB_DIR)\lib\zdll.lib
+!ENDIF
rm -f config.h $(BUILT_SOURCES)
cd wiretap
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
cd ..
+# None MSVC6 variants have to avoid indirectly using msvcrt.dll,
+# therefore compile the zlib dll from source ZLIB_DIR package.
+# To avoid path problems, copy the zlib sources to a temp dir,
+# compile and copy the resulting files back to (source) ZLIB_DIR
+$(ZLIB_DIR)\zlib1.dll:
+!IF "$(MSVC_VARIANT)" != "MSVC6"
+ xcopy $(ZLIB_DIR) zlib.tmp /D /I /E /Y
+ cd zlib.tmp
+ $(MAKE) /$(MAKEFLAGS) -f win32/Makefile.msc zlib1.dll LOC="-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE"
+ if not exist $(ZLIB_DIR) mkdir $(ZLIB_DIR)
+ if not exist $(ZLIB_DIR)\lib mkdir $(ZLIB_DIR)\lib
+ if not exist $(ZLIB_DIR)\include mkdir $(ZLIB_DIR)\include
+ copy zlib1.dll $(ZLIB_DIR)
+ if exist zlib1.dll.manifest copy zlib1.dll.manifest $(ZLIB_DIR)
+ copy zdll.lib $(ZLIB_DIR)\lib
+ copy zconf.h $(ZLIB_DIR)\include
+ copy zlib.h $(ZLIB_DIR)\include
+ cd ..
+ rm -r -f zlib.tmp
+!ENDIF
+
wiretap::
cd wiretap
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
$(CC) \
$(LINK) \
nmake \
- $(SH) \
+ $(SH_PROG) \
$(YACC) \
$(LEX) \
env \
@$(SH) tools\win32-setup.sh --appverify $(REQUIRED_TOOLS)
# Download and install all the required libraries into WIRESHARK_LIBS.
-# If you used this setup target before, consider doing a clean_setup.
-setup: verify_tools
-!IF "$(GTK2_INST_VERSION)" == "2.8"
+# A clean_setup is done first to ensure that the target dirs don't
+# contain old files remaining from a previous setup run.
+setup: verify_tools clean_setup
+ if not exist $(WIRESHARK_LIBS) md $(WIRESHARK_LIBS)
+!IF "$(GTK2_INST_VERSION)" == "2.10"
+ @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+ glib gtk2.10/glib-2.12.7.zip
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
- glib gtk2.8/glib-2.8.4-20051212.zip
+ glib gtk2.10/glib-dev-2.12.7.zip
+!ELSEIF "$(GTK2_INST_VERSION)" == "2.8"
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
- glib gtk2.8/glib-dev-2.8.4-20051212.zip
+ glib gtk2.8/glib-2.12.4.zip
+ @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+ glib gtk2.8/glib-dev-2.12.4.zip
!ELSEIF "$(GTK2_INST_VERSION)" == "2.6"
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
glib gtk2.6/glib-2.6.6.zip
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
libiconv-1.9.1.bin.woe32 libiconv-1.9.1.bin.woe32.zip
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
- gettext-runtime-0.13.1 gettext-runtime-0.13.1.zip
+ gettext-0.14.5 gettext-0.14.5.zip
!IFDEF NET_SNMP_DIR
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
- . net-snmp-5.3.1.zip
+ . net-snmp-5.4.zip
!ENDIF
!IFDEF KFW_DIR
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
. WpdPack_3_1.zip
!ENDIF
+!IFDEF AIRPCAP_DIR
+ @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+ AirPcap_Devpack_1_0_0_594 AirPcap_Devpack_1_0_0_594.zip
+!ENDIF
!IFDEF ADNS_DIR
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
. adns-1.0-win32-05.zip
pcre-6.4 pcre-6.4-lib.zip
!ENDIF
!IFDEF ZLIB_DIR
+!IF "$(MSVC_VARIANT)" == "MSVC6"
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
zlib123-dll zlib123-dll.zip
+!ELSE
+ @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+ zlib123 zlib123.zip
+!ENDIF
!ENDIF
!IFDEF LUA_DIR
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
!ENDIF
!IFDEF GNUTLS_DIR
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
- . gnutls-1.5.1-1.zip
+ . gnutls-1.6.1-1.zip
!ENDIF
!IFDEF PORTAUDIO_DIR
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
- . portaudio_v18_1.zip
+ . portaudio_v19.zip
!ENDIF
!IFDEF GTK2_DIR
-!IF "$(GTK2_INST_VERSION)" == "2.8"
+!IF "$(GTK2_INST_VERSION)" == "2.10"
+ @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+ gtk2 gtk2.10/gtk+-2.10.7.zip
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
- gtk2 gtk2.8/gtk+-2.8.9.zip
+ gtk2 gtk2.10/gtk+-dev-2.10.7.zip
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
- gtk2 gtk2.8/gtk+-dev-2.8.9.zip
+ gtk2 gtk2.10/cairo-1.2.6.zip
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
- gtk2 gtk2.8/cairo-1.0.2.zip
+ gtk2 gtk2.10/cairo-dev-1.2.6.zip
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
- gtk2 gtk2.8/cairo-dev-1.0.2.zip
+ gtk2 gtk2.10/atk-1.12.3.zip
+ @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+ gtk2 gtk2.10/atk-dev-1.12.3.zip
+ @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+ gtk2 gtk2.10/libpng-1.2.8-bin.zip
+!ELSEIF "$(GTK2_INST_VERSION)" == "2.8"
+ @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+ gtk2 gtk2.8/gtk+-2.8.20.zip
+ @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+ gtk2 gtk2.8/gtk+-dev-2.8.20.zip
+ @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+ gtk2 gtk2.8/cairo-1.2.6.zip
+ @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+ gtk2 gtk2.8/cairo-dev-1.2.6.zip
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
gtk2 gtk2.8/atk-1.10.3.zip
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
gtk2 gtk2.4/gtk+-dev-2.4.14.zip
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
- gtk2 gtk2.4/atk-1.6.0.zip
+ gtk2 gtk2.4/atk-1.6.1.zip
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
- gtk2 gtk2.4/atk-dev-1.6.0.zip
+ gtk2 gtk2.4/atk-dev-1.6.1.zip
!ELSE
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
gtk2 gtk2/gtk+-2.2.4-20040124.zip
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
gtk2 gtk2/atk-dev-1.4.0.zip
!ENDIF
-!IF "$(PANGO_INST_VERSION)" == "1.10"
+!IF "$(PANGO_INST_VERSION)" == "1.14"
+ @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+ gtk2 gtk2.10/pango-1.14.9.zip
+ @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+ gtk2 gtk2.10/pango-dev-1.14.9.zip
+!ELSEIF "$(PANGO_INST_VERSION)" == "1.10"
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
gtk2 gtk2.8/pango-1.10.1.zip
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
!IFDEF GTK_WIMP_DIR
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
gtk-wimp gtk-wimp/gtk-wimp-0.7.0-bin.zip
+!ENDIF
+!IFDEF HHC_DIR
+ @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+ user-guide user-guide-20494.zip
!ENDIF
@echo.
@echo Wireshark is ready to build.
# downloaded zip files.
clean_setup:
rm -r -f $(WIRESHARK_LIBS)/adns-1.0-win32-05
- rm -r -f $(WIRESHARK_LIBS)/gettext-runtime-0.13.1
+ rm -r -f $(WIRESHARK_LIBS)/gettext-0.14.5
rm -r -f $(WIRESHARK_LIBS)/glib
- rm -r -f $(WIRESHARK_LIBS)/gnutls-1.5.0-1
+ rm -r -f $(WIRESHARK_LIBS)/gnutls-1.6.1-1
rm -r -f $(WIRESHARK_LIBS)/gtk2
rm -r -f $(WIRESHARK_LIBS)/gtk+
rm -r -f $(WIRESHARK_LIBS)/gtk-wimp
rm -r -f $(WIRESHARK_LIBS)/kfw-2.5
rm -r -f $(WIRESHARK_LIBS)/libiconv-1.9.1.bin.woe32
rm -r -f $(WIRESHARK_LIBS)/lua5.1
- rm -r -f $(WIRESHARK_LIBS)/net-snmp-5.3.1
+ rm -r -f $(WIRESHARK_LIBS)/net-snmp-5.4
rm -r -f $(WIRESHARK_LIBS)/pcre-6.4
rm -r -f $(WIRESHARK_LIBS)/portaudio_v18_1
+ rm -r -f $(WIRESHARK_LIBS)/portaudio_v19
+ rm -r -f $(WIRESHARK_LIBS)/user-guide
rm -r -f $(WIRESHARK_LIBS)/WpdPack
+ rm -r -f $(WIRESHARK_LIBS)/AirPcap_Devpack_1_0_0_594
rm -r -f $(WIRESHARK_LIBS)/zlib123-dll
################################################################################
debug-tshark: tshark.exe
set copycmd=/y
set INSTALL_DIR=$(INSTALL2_DIR)
- nmake -f Makefile.nmake install-common-files
+ $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake install-common-files
+
+# generate and install Wireshark GTK2 in INSTALL2_DIR
+debug-dumpcap: dumpcap.exe
# "install-deps" will copy all files needed to run Wwireshark/Tshark
!IFDEF GTK1_DIR
set copycmd=/y
set INSTALL_DIR=$(INSTALL1_DIR)
- nmake -f Makefile.nmake install-common-files
+ $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake install-common-files
xcopy wireshark.exe $(INSTALL1_DIR) /d
+ if exist wireshark.exe.manifest xcopy wireshark.exe.manifest $(INSTALL1_DIR) /d
+ if exist wireshark.pdb xcopy wireshark.pdb $(INSTALL1_DIR) /d
!ENDIF
# install Wireshark GTK2 and other generated files
install-files2:
!IFDEF GTK2_DIR
set INSTALL_DIR=$(INSTALL2_DIR)
- nmake -f Makefile.nmake install-common-files
+ $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake install-common-files
copy wireshark-gtk2.exe $(INSTALL2_DIR)\wireshark.exe
+ if exist wireshark-gtk2.exe.manifest copy wireshark-gtk2.exe.manifest $(INSTALL2_DIR)\wireshark.exe.manifest
+ if exist wireshark-gtk2.pdb copy wireshark-gtk2.pdb $(INSTALL2_DIR)\wireshark.pdb
if exist ".\docbook\user-guide.chm" xcopy ".\docbook\user-guide.chm" $(INSTALL2_DIR) /d
!ENDIF
xcopy epan\libwireshark.dll $(INSTALL_DIR) /d
!ENDIF
xcopy ".\wiretap\wiretap-$(WTAP_VERSION).dll" $(INSTALL_DIR) /d
+ if exist ".\wiretap\wiretap-$(WTAP_VERSION).dll.manifest" xcopy ".\wiretap\wiretap-$(WTAP_VERSION).dll.manifest" $(INSTALL_DIR) /d
+ if exist ".\wiretap\wiretap-$(WTAP_VERSION).pdb" xcopy ".\wiretap\wiretap-$(WTAP_VERSION).pdb" $(INSTALL_DIR) /d
xcopy ".\epan\libwireshark.dll" $(INSTALL_DIR) /d
+ if exist ".\epan\libwireshark.dll.manifest" xcopy ".\epan\libwireshark.dll.manifest" $(INSTALL_DIR) /d
+ if exist ".\epan\libwireshark.pdb" xcopy ".\epan\libwireshark.pdb" $(INSTALL_DIR) /d
if exist tshark.exe xcopy tshark.exe $(INSTALL_DIR) /d
- if exist dumpcap.exe xcopy dumpcap.exe $(INSTALL2_DIR) /d
- if exist mergecap.exe xcopy mergecap.exe $(INSTALL2_DIR) /d
- if exist text2pcap.exe xcopy text2pcap.exe $(INSTALL2_DIR) /d
+ if exist tshark.exe.manifest xcopy tshark.exe.manifest $(INSTALL_DIR) /d
+ if exist tshark.pdb xcopy tshark.pdb $(INSTALL_DIR) /d
+ if exist dumpcap.exe xcopy dumpcap.exe $(INSTALL_DIR) /d
+ if exist dumpcap.exe.manifest xcopy dumpcap.exe.manifest $(INSTALL_DIR) /d
+ if exist dumpcap.pdb xcopy dumpcap.pdb $(INSTALL_DIR) /d
+ if exist mergecap.exe xcopy mergecap.exe $(INSTALL_DIR) /d
+ if exist mergecap.exe.manifest xcopy mergecap.exe.manifest $(INSTALL_DIR) /d
+ if exist mergecap.pdb xcopy mergecap.pdb $(INSTALL_DIR) /d
+ if exist text2pcap.exe xcopy text2pcap.exe $(INSTALL_DIR) /d
+ if exist text2pcap.exe.manifest xcopy text2pcap.exe.manifest $(INSTALL_DIR) /d
+ if exist text2pcap.pdb xcopy text2pcap.pdb $(INSTALL_DIR) /d
if exist capinfos.exe xcopy capinfos.exe $(INSTALL_DIR) /d
+ if exist capinfos.exe.manifest xcopy capinfos.exe.manifest $(INSTALL_DIR) /d
+ if exist capinfos.pdb xcopy capinfos.pdb $(INSTALL_DIR) /d
if exist editcap.exe xcopy editcap.exe $(INSTALL_DIR) /d
+ if exist editcap.exe.manifest xcopy editcap.exe.manifest $(INSTALL_DIR) /d
+ if exist editcap.pdb xcopy editcap.pdb $(INSTALL_DIR) /d
xcopy ".\AUTHORS-SHORT" $(INSTALL_DIR) /d
xcopy ".\manuf" $(INSTALL_DIR) /d
xcopy ".\FAQ" $(INSTALL_DIR) /d
xcopy ".\diameter\*.dtd" $(INSTALL_DIR)\diameter /d
xcopy ".\diameter\*.xml" $(INSTALL_DIR)\diameter /d
if not exist $(INSTALL_DIR)\plugins\$(VERSION) mkdir $(INSTALL_DIR)\plugins\$(VERSION)
- xcopy ".\plugins\acn\acn.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
xcopy ".\plugins\agentx\agentx.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
xcopy ".\plugins\artnet\artnet.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
xcopy ".\plugins\asn1\asn1.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
xcopy ".\plugins\opsi\opsi.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
xcopy ".\plugins\pcli\pcli.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
xcopy ".\plugins\profinet\profinet.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
- xcopy ".\plugins\rdm\rdm.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
xcopy ".\plugins\rlm\rlm.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
xcopy ".\plugins\rtnet\rtnet.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
xcopy ".\plugins\rudp\rudp.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
if not exist $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR) mkdir $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)
if not exist $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders mkdir $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders
if not exist $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules mkdir $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules
- if not exist $(INSTALL2_DIR)\lib\pango mkdir $(INSTALL2_DIR)\lib\pango
- if not exist $(INSTALL2_DIR)\lib\pango\$(PANGO_LIB_DIR) mkdir $(INSTALL2_DIR)\lib\pango\$(PANGO_LIB_DIR)
- if not exist $(INSTALL2_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules mkdir $(INSTALL2_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules
+# if not exist $(INSTALL2_DIR)\lib\pango mkdir $(INSTALL2_DIR)\lib\pango
+# if not exist $(INSTALL2_DIR)\lib\pango\$(PANGO_LIB_DIR) mkdir $(INSTALL2_DIR)\lib\pango\$(PANGO_LIB_DIR)
+# if not exist $(INSTALL2_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules mkdir $(INSTALL2_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules
xcopy $(GTK2_DIR)\etc\gtk-2.0\*.* $(INSTALL2_DIR)\etc\gtk-2.0 /d
xcopy $(GTK2_DIR)\etc\pango\pango.* $(INSTALL2_DIR)\etc\pango /d
xcopy $(GTK2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders\libpixbufloader-*.dll $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders /d
xcopy $(GTK2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules\im-*.dll $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules /d
- xcopy $(GTK2_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules\pango-*.dll $(INSTALL2_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules /d
+# xcopy $(GTK2_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules\pango-*.dll $(INSTALL2_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules /d
!IFDEF NEED_LIBPNG_DLL
xcopy $(GTK2_DIR)\bin\libpng13.dll $(INSTALL2_DIR) /d
!ENDIF
xcopy $(GTK2_DIR)\bin\libcairo-2.dll $(INSTALL2_DIR) /d
xcopy $(GTK2_DIR)\bin\libpangocairo-1.0-0.dll $(INSTALL2_DIR) /d
!ENDIF
- if not exist $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\engines mkdir $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\engines
- xcopy "$(GTK_WIMP_DIR)\libwimp.dll" $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\engines /d
-!IF "$(GTK2_INST_VERSION)" != "2.8"
- if not exist $(INSTALL2_DIR)\share\themes\Default\gtk-2.0 mkdir $(INSTALL2_DIR)\share\themes\Default\gtk-2.0
- xcopy "$(GTK_WIMP_DIR)\Theme\gtk-2.0\gtkrc" $(INSTALL2_DIR)\share\themes\Default\gtk-2.0 /d
+!IFDEF GTK_WIMP_DIR
+ if not exist $(INSTALL2_DIR)\$(GTK_WIMP_DLLDST_DIR) mkdir $(INSTALL2_DIR)\$(GTK_WIMP_DLLDST_DIR)
+ xcopy "$(GTK_WIMP_DLLSRC_DIR)\libwimp.dll" $(INSTALL2_DIR)\$(GTK_WIMP_DLLDST_DIR) /d
+ if not exist $(INSTALL2_DIR)\$(GTK_WIMP_RCDST_DIR) mkdir $(INSTALL2_DIR)\$(GTK_WIMP_RCDST_DIR)
+ xcopy "$(GTK_WIMP_RCSRC_DIR)\gtkrc" $(INSTALL2_DIR)\$(GTK_WIMP_RCDST_DIR) /d
!ENDIF
!ENDIF
install-common-deps1:
!IFDEF GTK1_DIR
set INSTALL_DIR=$(INSTALL1_DIR)
- nmake -f Makefile.nmake install-common-deps
+ $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake install-common-deps
!ENDIF
install-common-deps2:
!IFDEF GTK2_DIR
set INSTALL_DIR=$(INSTALL2_DIR)
- nmake -f Makefile.nmake install-common-deps
+ $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake install-common-deps
!ENDIF
install-common-deps:
!ENDIF
!IFDEF GNUTLS_DIR
xcopy $(GNUTLS_DIR)\bin\libgcrypt-11.dll $(INSTALL_DIR) /d
- xcopy $(GNUTLS_DIR)\bin\libgnutls-14.dll $(INSTALL_DIR) /d
- xcopy $(GNUTLS_DIR)\bin\libgnutls-extra-14.dll $(INSTALL_DIR) /d
- xcopy $(GNUTLS_DIR)\bin\libgnutls-openssl-14.dll $(INSTALL_DIR) /d
+ xcopy $(GNUTLS_DIR)\bin\libgnutls-13.dll $(INSTALL_DIR) /d
+ xcopy $(GNUTLS_DIR)\bin\libgnutls-extra-13.dll $(INSTALL_DIR) /d
+ xcopy $(GNUTLS_DIR)\bin\libgnutls-openssl-13.dll $(INSTALL_DIR) /d
xcopy $(GNUTLS_DIR)\bin\libgpg-error-0.dll $(INSTALL_DIR) /d
xcopy $(GNUTLS_DIR)\bin\libtasn1-3.dll $(INSTALL_DIR) /d
!ENDIF
!IFDEF NET_SNMP_DIR
- if not exist $(INSTALL_DIR)\mibs mkdir $(INSTALL_DIR)\mibs
- xcopy "$(NET_SNMP_DIR)\mibs\*.txt" $(INSTALL_DIR)\mibs /d
+ if not exist $(INSTALL_DIR)\snmp mkdir $(INSTALL_DIR)\snmp
+ if not exist $(INSTALL_DIR)\snmp\mibs mkdir $(INSTALL_DIR)\snmp\mibs
+ xcopy "$(NET_SNMP_DIR)\mibs\*.txt" $(INSTALL_DIR)\snmp\mibs /d
!ENDIF
!IFDEF LUA_DIR
xcopy "$(LUA_DIR)\lib\dll\lua5.1.dll" $(INSTALL_DIR) /d
git.samba.org / obnox / wireshark / wip.git / blobdiff