diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-04-14 18:47:36 +0200 |
---|---|---|
committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2015-04-16 06:04:53 +0000 |
commit | 8e7d904880e2606f3b41abddc592ddd735c9982c (patch) | |
tree | 9aeac564b8a4a73cde23f695b2f9b9c415d3219d /Makefile.nmake | |
parent | b845785a73e4d2224da6b2e1ca7be7a76de07352 (diff) |
androiddump: stop recompiling systematically androiddump.c with nmake
Our default rules are confused because source file is in a subfolder of the nmake makefile
Change-Id: If3dee4cd5b3be493abfe8c696383fb170952260b
Reviewed-on: https://code.wireshark.org/review/8068
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'Makefile.nmake')
-rw-r--r-- | Makefile.nmake | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 61783949d7..de21cb4bc8 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -68,7 +68,9 @@ dftest_OBJECTS = $(dftest_SOURCES:.c=.obj) dumpcap_OBJECTS = $(dumpcap_SOURCES:.c=.obj) randpkt_OBJECTS = $(randpkt_SOURCES:.c=.obj) reordercap_OBJECTS = $(reordercap_SOURCES:.c=.obj) -androiddump_OBJECTS = $(androiddump_SOURCES:.c=.obj) +# this does not work because source file is in a subfolder of this makefile +# and we end up recompiling systematically androiddump.c +#androiddump_OBJECTS = $(androiddump_SOURCES:.c=.obj) # # psapi.lib see http://msdn.microsoft.com/en-us/library/windows/desktop/ms683219(v=vs.85).aspx @@ -428,7 +430,7 @@ randpkt.exe : $(randpkt_OBJECTS) mt.exe -nologo -manifest "randpkt.exe.manifest" -outputresource:randpkt.exe;1 !ENDIF -androiddump.exe : $(LIBS_CHECK) config.h $(androiddump_OBJECTS) wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib +androiddump.exe : $(LIBS_CHECK) config.h androiddump.obj wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib @echo Linking $@ $(LINK) @<< /OUT:androiddump.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:WINDOWS androiddump.obj $(androiddump_LIBS) @@ -568,6 +570,9 @@ text2pcap-scanner.c : text2pcap-scanner.l text2pcap-scanner.obj : text2pcap-scanner.c $(CC) $(GENERATED_CFLAGS) -Fd.\ -c $? +androiddump.obj : extcap/androiddump.c + $(CC) $(CFLAGS) -Fd.\ -c $? + test-programs: cd epan $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake test-programs |