aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2014-05-01 10:58:22 -0400
committerBill Meier <wmeier@newsguy.com>2014-05-01 15:12:46 +0000
commita42b04eade88c6b952b4600bd87361601dfd9d49 (patch)
treed668353adb75723aa5ff68ebe30d2dd384c75b27
parent5410fab0804041094a130f845839d5b273300ace (diff)
Remove 'include win32.mak' from certain nmake files when not needed.
Change-Id: I05a505d884abb5fd7fca87bb89af29e3e4502b74 Reviewed-on: https://code.wireshark.org/review/1460 Reviewed-by: Bill Meier <wmeier@newsguy.com>
-rw-r--r--echld/Makefile.nmake1
-rw-r--r--packaging/Makefile.nmake1
-rw-r--r--packaging/portableapps/win32/Makefile.nmake1
-rw-r--r--plugins/tpg/Makefile.nmake1
4 files changed, 0 insertions, 4 deletions
diff --git a/echld/Makefile.nmake b/echld/Makefile.nmake
index d82c00312e..5de6da7392 100644
--- a/echld/Makefile.nmake
+++ b/echld/Makefile.nmake
@@ -3,7 +3,6 @@
#
include ..\config.nmake
-include <win32.mak>
include ..\Makefile.nmake.inc
############### no need to modify below this line #########
diff --git a/packaging/Makefile.nmake b/packaging/Makefile.nmake
index 4c090afd59..2506497323 100644
--- a/packaging/Makefile.nmake
+++ b/packaging/Makefile.nmake
@@ -1,7 +1,6 @@
#
include ../config.nmake
-include <win32.mak>
wireshark.manifest: nsis/wireshark.nsi ws-manifest.pl
$(PERL) ws-manifest.pl nsis/wireshark.nsi > $@
diff --git a/packaging/portableapps/win32/Makefile.nmake b/packaging/portableapps/win32/Makefile.nmake
index ddaa092d8e..edcac31322 100644
--- a/packaging/portableapps/win32/Makefile.nmake
+++ b/packaging/portableapps/win32/Makefile.nmake
@@ -1,7 +1,6 @@
#
include ../../../config.nmake
-include <win32.mak>
FILES = Files
APP = App
diff --git a/plugins/tpg/Makefile.nmake b/plugins/tpg/Makefile.nmake
index 9ecf2c0b0e..281830a979 100644
--- a/plugins/tpg/Makefile.nmake
+++ b/plugins/tpg/Makefile.nmake
@@ -1,7 +1,6 @@
#
include ..\..\config.nmake
-include <win32.mak>
############### no need to modify below this line #########