diff options
| author | Luis Ontanon <luis.ontanon@gmail.com> | 2006-09-26 03:31:00 +0000 |
|---|---|---|
| committer | Luis Ontanon <luis.ontanon@gmail.com> | 2006-09-26 03:31:00 +0000 |
| commit | c8a95a05486c6643994aaa1999a58455337b21ef (patch) | |
| tree | 68bbadaa72c760f7ba8f45eaa5778c4e044a3c03 /epan/Makefile.nmake | |
| parent | b9a1426d47bce7df316efd65a99151c16dd2e0a5 (diff) | |
Lua 5.1.1 for windows
svn path=/trunk/; revision=19324
Diffstat (limited to 'epan/Makefile.nmake')
| -rw-r--r-- | epan/Makefile.nmake | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index 14b4829bd6..f82a14c6cd 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -26,9 +26,12 @@ libwireshark_LIBS = \ $(ZLIB_LIBS) \ $(GNUTLS_LIBS) \ $(NET_SNMP_LIBS) \ + $(LUA_LIBS) \ + ..\wiretap\wiretap-$(WTAP_VERSION).lib \ $(ICONV_DIR)\lib\iconv.lib \ ftypes\ftypes.lib \ dfilter\dfilter.lib \ + wslua\wslua.lib \ dissectors\dissectors.lib .c.obj:: @@ -50,17 +53,17 @@ DOXYGEN_DEP=doxygen !ENDIF !IFDEF ENABLE_LIBWIRESHARK -all: ftypes dfilter dissectors libwireshark.dll +all: ftypes dfilter wslua dissectors libwireshark.dll !ELSE -all: ftypes dfilter dissectors libwireshark.lib +all: ftypes dfilter wslua dissectors libwireshark.lib !ENDIF # For use when making libwireshark.dll libwireshark.lib: libwireshark.dll libwireshark.exp: libwireshark.dll -libwireshark.dll: ..\config.h $(LIBWIRESHARK_OBJECTS) libwireshark.def ftypes dfilter dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \ - ftypes\ftypes.lib dfilter\dfilter.lib dissectors\dissectors.lib ..\image\libwireshark.res +libwireshark.dll: ..\config.h $(LIBWIRESHARK_OBJECTS) libwireshark.def ftypes dfilter wslua dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \ + ftypes\ftypes.lib dfilter\dfilter.lib dissectors\dissectors.lib wslua\wslua.lib ..\image\libwireshark.res @echo Linking libwireshark.dll $(link) $(dlllflags) $(conlibsdll) \ $(LOCAL_LDFLAGS) \ @@ -70,8 +73,8 @@ libwireshark.dll: ..\config.h $(LIBWIRESHARK_OBJECTS) libwireshark.def ftypes df dissectors\register.obj \ $(EXTRA_OBJECTS) -libwireshark.lib : ..\config.h $(LIBWIRESHARK_OBJECTS) ftypes dfilter dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \ - ftypes\ftypes.lib dfilter\dfilter.lib dissectors\dissectors.lib +libwireshark.lib : ..\config.h $(LIBWIRESHARK_OBJECTS) ftypes dfilter wslua dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \ + ftypes\ftypes.lib dfilter\dfilter.lib wslua\wslua.lib dissectors\dissectors.lib link /lib /out:libwireshark.lib $(LIBWIRESHARK_OBJECTS) \ $(EXTRA_OBJECTS) @@ -89,6 +92,8 @@ clean: $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd ../dissectors $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean + cd ../wslua + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd .. # @@ -110,6 +115,8 @@ distclean: clean $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean cd ../dissectors $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean + cd ../wslua + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean cd .. maintainer-clean: distclean @@ -119,6 +126,8 @@ maintainer-clean: distclean $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean cd ../dissectors $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean + cd ../wslua + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean cd .. ftypes:: ..\config.h @@ -136,6 +145,11 @@ dissectors:: ..\config.h $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake cd .. +wslua:: ..\config.h + cd wslua + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake + cd .. + doxygen.cfg: ..\config.nmake doxygen.cfg.in sed -e s/@VERSION@/$(VERSION)/ \ < doxygen.cfg.in > $@ |