diff options
Diffstat (limited to 'epan/dissectors/Makefile.nmake')
| -rw-r--r-- | epan/dissectors/Makefile.nmake | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/epan/dissectors/Makefile.nmake b/epan/dissectors/Makefile.nmake index 4fc827e860..93ffda6289 100644 --- a/epan/dissectors/Makefile.nmake +++ b/epan/dissectors/Makefile.nmake @@ -9,7 +9,7 @@ include ..\..\config.nmake include Makefile.common -CFLAGS=-DHAVE_CONFIG_H /I. /I.. /I../.. $(GLIB_CFLAGS) \ +CFLAGS=-DHAVE_CONFIG_H -DHAVE_AIRPDCAP /I. /I.. /I../.. $(GLIB_CFLAGS) \ $(NET_SNMP_CFLAGS) \ $(PCRE_CFLAGS) $(GNUTLS_CFLAGS) $(NETTLE_CFLAGS) \ $(KFW_CFLAGS) \ @@ -24,9 +24,9 @@ DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj) DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_SRC:.c=.obj) -dissectors.lib: register.obj packet-ncp2222.c $(GENERATED_HEADER_FILES) ../../config.h $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) +dissectors.lib: airpdcap.lib register.obj packet-ncp2222.c $(GENERATED_HEADER_FILES) ../../config.h $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) @echo Linking dissectors.lib - link /lib /out:dissectors.lib $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) + link /lib /out:dissectors.lib $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) ..\..\airpdcap\airpdcap.lib # # The header files listed here are built from x11-fields using Perl; @@ -73,6 +73,12 @@ x11-declarations.h x11-register-info.h: x11-fields process-x11-fields.pl # a register.c file for libwireshark. # All subsequent arguments are the files to scan. # + +airpdcap.lib: + cd ..\..\airpdcap + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake + cd ..\epan\dissectors + register.c: $(DISSECTOR_SRC) !IFDEF PYTHON @echo Making register.c (using python) @@ -95,6 +101,9 @@ packet-ncp2222.c : ncp2222.py !ENDIF clean: + cd ..\..\airpdcap + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean + cd ..\epan\dissectors rm -f dissectors.lib $(PDB_FILE) \ $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) |