diff options
| author | Gerald Combs <gerald@wireshark.org> | 2006-09-26 22:51:04 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2006-09-26 22:51:04 +0000 |
| commit | f9915b8150486701058c362c5d65d13c7d7392cb (patch) | |
| tree | 165378f18a10b84fe9c925d14dc0d33371f390f3 | |
| parent | d1737fd2ebf5cfe5c34ff377bba3c0cc1091379d (diff) | |
Don't try to build wslua if LUA_DIR isn't defined.
svn path=/trunk/; revision=19330
| -rw-r--r-- | epan/Makefile.nmake | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index f82a14c6cd..e77ee223f4 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -16,6 +16,14 @@ CFLAGS=-DHAVE_CONFIG_H /I. /I.. /I../wiretap $(GLIB_CFLAGS) \ CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL +!IFDEF LUA_DIR +WSLUA_LIB=wslua\wslua.lib +WSLUA_DIR=wslua +!ELSE +WSLUA_LIB= +WSLUA_DIR= +!ENDIf + # For use when making libwireshark.dll libwireshark_LIBS = \ $(GLIB_LIBS) \ @@ -31,7 +39,7 @@ libwireshark_LIBS = \ $(ICONV_DIR)\lib\iconv.lib \ ftypes\ftypes.lib \ dfilter\dfilter.lib \ - wslua\wslua.lib \ + $(WSLUA_LIB) \ dissectors\dissectors.lib .c.obj:: @@ -53,17 +61,17 @@ DOXYGEN_DEP=doxygen !ENDIF !IFDEF ENABLE_LIBWIRESHARK -all: ftypes dfilter wslua dissectors libwireshark.dll +all: ftypes dfilter $(WSLUA_DIR) dissectors libwireshark.dll !ELSE -all: ftypes dfilter wslua dissectors libwireshark.lib +all: ftypes dfilter $(WSLUA_DIR) 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 wslua dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \ - ftypes\ftypes.lib dfilter\dfilter.lib dissectors\dissectors.lib wslua\wslua.lib ..\image\libwireshark.res +libwireshark.dll: ..\config.h $(LIBWIRESHARK_OBJECTS) libwireshark.def ftypes dfilter $(WSLUA_DIR) dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \ + ftypes\ftypes.lib dfilter\dfilter.lib dissectors\dissectors.lib $(WSLUA_LIB) ..\image\libwireshark.res @echo Linking libwireshark.dll $(link) $(dlllflags) $(conlibsdll) \ $(LOCAL_LDFLAGS) \ @@ -73,8 +81,8 @@ libwireshark.dll: ..\config.h $(LIBWIRESHARK_OBJECTS) libwireshark.def ftypes df dissectors\register.obj \ $(EXTRA_OBJECTS) -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 +libwireshark.lib : ..\config.h $(LIBWIRESHARK_OBJECTS) ftypes dfilter $(WSLUA_DIR) dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \ + ftypes\ftypes.lib dfilter\dfilter.lib $(WSLUA_LIB) dissectors\dissectors.lib link /lib /out:libwireshark.lib $(LIBWIRESHARK_OBJECTS) \ $(EXTRA_OBJECTS) |