diff options
| author | Guy Harris <guy@alum.mit.edu> | 2010-07-15 03:31:51 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2010-07-15 03:31:51 +0000 |
| commit | 4b6f53894aa2c802e85d1ada913755e5cdab18aa (patch) | |
| tree | 0c8221329bfa565476b1855dbc743357355314d0 | |
| parent | 2326b33f0a6513f66cf864ea6d799b46c8c6e9b5 (diff) | |
There shouldn't be any need to build stuff in the top-level directory
with the Lua or libgnutls flags, as nothing in the top-level directory
should use them directly.
However, libwireshark *does* require the Lua flags, so use them.
svn path=/trunk/; revision=33534
| -rw-r--r-- | Makefile.nmake | 8 | ||||
| -rw-r--r-- | epan/Makefile.nmake | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index a15b1e8fcf..4bef69b763 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -40,11 +40,9 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no $(LOCAL_LDFLAGS) # We use GENERATED_CFLAGS to get around flex's non-LLP64-compliant output GENERATED_CFLAGS=-DHAVE_CONFIG_H $(LOCAL_CFLAGS) $(GLIB_CFLAGS) /I. /Iwiretap \ - $(ZLIB_CFLAGS) /I$(PCAP_DIR)\include \ - $(AIRPCAP_CFLAGS) \ - $(C_ARES_CFLAGS) $(ADNS_CFLAGS) $(PCRE_CFLAGS) $(GNUTLS_CFLAGS) \ - $(LUA_CFLAGS) $(PYTHON_CFLAGS) $(SMI_CFLAGS) $(GEOIP_CFLAGS) \ - -D_U_="" -D_NEED_VAR_IMPORT_ + $(ZLIB_CFLAGS) /I$(PCAP_DIR)\include $(AIRPCAP_CFLAGS) \ + $(C_ARES_CFLAGS) $(ADNS_CFLAGS) $(PCRE_CFLAGS) $(PYTHON_CFLAGS) \ + $(SMI_CFLAGS) $(GEOIP_CFLAGS) -D_U_="" -D_NEED_VAR_IMPORT_ CFLAGS=-WX $(GENERATED_CFLAGS) CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index 77f5fa026e..361b2debd2 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -14,7 +14,7 @@ LINK= link # We use GENERATED_CFLAGS to get around flex's non-LLP64-compliant output GENERATED_CFLAGS=-DHAVE_CONFIG_H /I. /I.. /I../wiretap $(GLIB_CFLAGS) \ $(ZLIB_CFLAGS) $(C_ARES_CFLAGS) $(ADNS_CFLAGS) $(PCRE_CFLAGS) \ - $(GNUTLS_CFLAGS) /I$(PCAP_DIR)\include \ + $(LUA_CFLAGS) $(GNUTLS_CFLAGS) /I$(PCAP_DIR)\include \ $(SMI_CFLAGS) $(GEOIP_CFLAGS) -D_U_="" $(LOCAL_CFLAGS) CFLAGS=-WX $(GENERATED_CFLAGS) |