diff options
| author | Luis Ontanon <luis.ontanon@gmail.com> | 2007-05-25 17:22:32 +0000 |
|---|---|---|
| committer | Luis Ontanon <luis.ontanon@gmail.com> | 2007-05-25 17:22:32 +0000 |
| commit | 11f06217ced22efb25ff4157216622ea24da7cab (patch) | |
| tree | 2ff6203726b046cb044b2ba9f79980fd79fea61d /Makefile.nmake | |
| parent | c22f70ec1be27d319953eaa4e37e73fec6810d42 (diff) | |
| download | wireshark-11f06217ced22efb25ff4157216622ea24da7cab.tar.gz wireshark-11f06217ced22efb25ff4157216622ea24da7cab.tar.bz2 wireshark-11f06217ced22efb25ff4157216622ea24da7cab.zip | |
Have editcap and capinfos loading the wiretap plugins.
epan/filesystem.c
have get_plugin_dir() calling init_plugin_dir() if necessary
epan/epan.c and epan/report_err.c
move the report_failure family into the new report_err.c file, have epan_init() calling the initializer
epan/plugins.h and epan/proto.c
do not have init_plugins() calling the proto_reg functions instead do it in init_proto()
gtk/main.c and tshark.c
init_plugin_dir() has become suprefluous
capinfos.c and editcap.c
load the wiretap plugins
Makefiles
do what's needed to build withe the above changes.
svn path=/trunk/; revision=21935
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 74be16308e..4d27e46ad7 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -75,11 +75,11 @@ tshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ !ENDIF capinfos_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ - wsock32.lib user32.lib \ + wsock32.lib user32.lib shell32.lib \ $(GLIB_LIBS) editcap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ - wsock32.lib user32.lib \ + wsock32.lib user32.lib shell32.lib \ $(GLIB_LIBS) mergecap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ @@ -214,19 +214,19 @@ tshark.exe : config.h svnversion.h $(tshark_OBJECTS) getopt.obj epan image\tshar mt.exe -nologo -manifest "tshark.exe.manifest" -outputresource:tshark.exe;1 !ENDIF -capinfos.exe : config.h capinfos.obj getopt.obj wiretap\wiretap-$(WTAP_VERSION).lib image\capinfos.res +capinfos.exe : config.h capinfos.obj getopt.obj epan/unicode-utils.obj epan/plugins.obj epan/report_err.obj epan/privileges.obj epan/filesystem.obj wiretap\wiretap-$(WTAP_VERSION).lib image\capinfos.res @echo Linking $@ $(LINK) @<< - /OUT:capinfos.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console capinfos.obj getopt.obj $(capinfos_LIBS) image\capinfos.res + /OUT:capinfos.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console capinfos.obj getopt.obj epan/unicode-utils.obj epan/plugins.obj epan/report_err.obj epan/privileges.obj epan/filesystem.obj $(capinfos_LIBS) image\capinfos.res << !IF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20" mt.exe -nologo -manifest "capinfos.exe.manifest" -outputresource:capinfos.exe;1 !ENDIF -editcap.exe : config.h editcap.obj getopt.obj strptime.obj epan\crypt\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 epan/unicode-utils.obj epan/plugins.obj epan/report_err.obj epan/privileges.obj epan/filesystem.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\crypt-md5.obj $(editcap_LIBS) image\editcap.res + /OUT:editcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console editcap.obj getopt.obj strptime.obj epan/unicode-utils.obj epan\crypt\crypt-md5.obj epan/plugins.obj epan/report_err.obj epan/privileges.obj epan/filesystem.obj $(editcap_LIBS) image\editcap.res << !IF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20" mt.exe -nologo -manifest "editcap.exe.manifest" -outputresource:editcap.exe;1 @@ -870,6 +870,8 @@ install-common-files: xcopy ".\cfilters" $(INSTALL_DIR) /d xcopy ".\colorfilters" $(INSTALL_DIR) /d xcopy ".\dfilters" $(INSTALL_DIR) /d + xcopy ".\epan\wslua\init.lua" $(INSTALL_DIR) /d + xcopy ".\epan\wslua\console.lua" $(INSTALL_DIR) /d xcopy doc\*.html $(INSTALL_DIR) /d !IFDEF ETHEREAL_EUG_DIR xcopy $(ETHEREAL_EUG_DIR) $(INSTALL_DIR) /d @@ -1026,3 +1028,4 @@ clean-deps2: clean-deps: clean-deps1 clean-deps2 + |