aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.nmake
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2016-02-15 04:25:53 -0800
committerGuy Harris <guy@alum.mit.edu>2016-02-15 12:26:27 +0000
commit2345a2b27c33fd1b02842b36e48640ec3e30d00b (patch)
treedcbeee70ae922e322a1b994f4e15df98dc30aef6 /Makefile.nmake
parent143ce9471381744ab333d397fc964cc522e32ec3 (diff)
Some more randpkt_core.
Change-Id: I62181a2b2664095a818e9adefce79b59b4510a34 Reviewed-on: https://code.wireshark.org/review/13952 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'Makefile.nmake')
-rw-r--r--Makefile.nmake18
1 files changed, 16 insertions, 2 deletions
diff --git a/Makefile.nmake b/Makefile.nmake
index a0a50d72cb..f2788e9489 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -223,7 +223,7 @@ RESOURCES=image\wireshark.res image\file_dlg_win32.res \
image\rawshark.res image\reordercap.res image\libwsutil.res
-all: $(LIBS_CHECK) config.h ui\qt\config.pri tools image $(C_ARES_DLL) $(ADNS_DLL) $(ZLIB_DLL) wsutil codecs wiretap epan $(EXECUTABLES) wireshark.bsc $(RESOURCES) help install-all
+all: $(LIBS_CHECK) config.h ui\qt\config.pri tools image $(C_ARES_DLL) $(ADNS_DLL) $(ZLIB_DLL) wsutil codecs wiretap epan randpkt_core $(EXECUTABLES) wireshark.bsc $(RESOURCES) help install-all
!IFDEF MAKENSIS
packaging: all
@@ -288,6 +288,7 @@ wireshark.bsc: \
plugins\wimax\*.sbr \
plugins\wimaxasncp\*.sbr \
plugins\wimaxmacphy\*.sbr \
+ randpkt_core\*.sbr \
ui\*.sbr \
ui\cli\*.sbr \
ui\gtk\*.sbr \
@@ -419,7 +420,7 @@ dftest.exe : $(dftest_OBJECTS) epan ui
mt.exe -nologo -manifest "dftest.exe.manifest" -outputresource:dftest.exe;1
!ENDIF
-randpkt.exe : $(randpkt_OBJECTS) randpkt_core\librandpkt_core.lib
+randpkt.exe : $(randpkt_OBJECTS) randpkt_core
@echo Linking $@
$(LINK) @<<
/OUT:randpkt.exe $(conflags) $(conlibsdll) $(LDFLAGS) $(randpkt_LIBS) $(randpkt_OBJECTS)
@@ -605,6 +606,8 @@ clean: clean-local
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
cd ../caputils
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
+ cd ../randpkt_core
+ $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
cd ../codecs
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
cd ../ui
@@ -661,6 +664,8 @@ distclean: distclean-local
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
cd ../caputils
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
+ cd ../randpkt_core
+ $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
cd ../codecs
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
cd ../ui
@@ -710,6 +715,8 @@ maintainer-clean: maintainer-clean-local
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
cd ../caputils
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+ cd ../randpkt_core
+ $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
cd ../codecs
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
cd ../ui
@@ -828,6 +835,11 @@ caputils:: help config.h version.h doxygen
$(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libcaputils.lib
cd ..
+randpkt_core:: help config.h version.h doxygen
+ cd randpkt_core
+ $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake librandpkt_core.lib
+ cd ..
+
codecs::
cd codecs
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
@@ -1506,6 +1518,8 @@ checkapi: checkapi_local
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi
cd ../caputils
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi
+ cd ../randpkt_core
+ $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi
cd ../codecs
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi
cd ../ui