diff options
| author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-12-28 17:22:12 +0000 |
|---|---|---|
| committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-12-28 17:22:12 +0000 |
| commit | 67206f046cafbc58fb7b7c36425fdbadbda1bc74 (patch) | |
| tree | ef14ce379885a746930a9839b20bebb530b35d04 /epan/dissectors/Makefile.nmake | |
| parent | 755eecea3093d1067490d3aaf2e3a3a799c7bdc0 (diff) | |
Move the contents of airpdcap to epan/crypt. Try to fix the current
distcheck failure. Move the nmake build targets for airpdcap from
epan/dissectors to epan. This will probably break the Windows build.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20231 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/Makefile.nmake')
| -rw-r--r-- | epan/dissectors/Makefile.nmake | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/epan/dissectors/Makefile.nmake b/epan/dissectors/Makefile.nmake index d63ebd842f..d45d0d8c2b 100644 --- a/epan/dissectors/Makefile.nmake +++ b/epan/dissectors/Makefile.nmake @@ -24,9 +24,9 @@ DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj) DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_SRC:.c=.obj) -dissectors.lib: airpdcap.lib register.obj packet-ncp2222.c $(GENERATED_HEADER_FILES) ../../config.h $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) +dissectors.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) ..\..\airpdcap\airpdcap.lib + link /lib /out:dissectors.lib $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) # # The header files listed here are built from x11-fields using Perl; @@ -74,11 +74,6 @@ x11-declarations.h x11-register-info.h: x11-fields process-x11-fields.pl # 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) @@ -101,9 +96,6 @@ 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) |