aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>2011-02-02 01:19:53 +0000
committerwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>2011-02-02 01:19:53 +0000
commit1bf717545340cdf023eee450221e30caee92a5d1 (patch)
tree5d9b2fd59c1e3d5a929f07797195a7b93b88c549 /plugins
parent910a4a2ffbe7e5178942c503d3d1c1ab2db32d05 (diff)
A bit of Windows makefiles rework and cleanup:
- Define macros for certain CFLAGS in config.nmake iso of having defs in each makefile; a. -DHAVE_CONFIG_H and -D_U_="" are now part of a macro named STANDARD_CFLAGS; b. -WX has been replaced by WARNINGS_ARE_ERRORS (defined as -WX in config.nmake) (This allows disabling "Warnings as Errors" by just changing config.nmake) c. CVARSDLL definitions (not usage) have been removed from the various makefiles. XXX: It appears the usage of CVARSDLL can also be removed (not yet done) since: -DWIN32 and -DNULL=0 do not appear to be needed (any more); -D_MT and _D_DLL are not needed since /MP causes these definitions. d. Define a macro WARNINGS_CFLAGS with additional specific compiler (level4) warnings to be enabled. E.G., 4295: array is too small to include a terminating null character - config.nmake: reformat some long lines for readability; - plugins\Makefile.nmake: clean-deps does nothing: remove it (and usage in top-level makefile); - dissectors/Makefile.nmake: test to enable packet-rrc.obj target needs to include MSVC2010 ... git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35747 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'plugins')
-rw-r--r--plugins/Makefile.nmake2
-rw-r--r--plugins/asn1/Makefile.nmake5
-rw-r--r--plugins/docsis/Makefile.nmake5
-rw-r--r--plugins/easy_codec/Makefile.nmake5
-rw-r--r--plugins/ethercat/Makefile.nmake5
-rw-r--r--plugins/giop/Makefile.nmake5
-rw-r--r--plugins/gryphon/Makefile.nmake5
-rw-r--r--plugins/interlink/Makefile.nmake5
-rw-r--r--plugins/irda/Makefile.nmake5
-rw-r--r--plugins/m2m/Makefile.nmake5
-rw-r--r--plugins/mate/Makefile.nmake9
-rw-r--r--plugins/opcua/Makefile.nmake5
-rw-r--r--plugins/profinet/Makefile.nmake5
-rw-r--r--plugins/sercosiii/Makefile.nmake5
-rw-r--r--plugins/stats_tree/Makefile.nmake5
-rw-r--r--plugins/tpg/Makefile.nmake5
-rw-r--r--plugins/unistim/Makefile.nmake5
-rw-r--r--plugins/wimax/Makefile.nmake5
-rw-r--r--plugins/wimaxasncp/Makefile.nmake10
19 files changed, 59 insertions, 42 deletions
diff --git a/plugins/Makefile.nmake b/plugins/Makefile.nmake
index 259c5e1e2d..d90971f459 100644
--- a/plugins/Makefile.nmake
+++ b/plugins/Makefile.nmake
@@ -74,8 +74,6 @@ install-plugins:
if exist Custom.nmake $(MAKE) /$(MAKEFLAGS) -f Custom.nmake install-plugins
!ENDIF
-clean-deps:
-
####
_FORCE_: ## Assumption: no file named _FORCE_ exists in the current directory
diff --git a/plugins/asn1/Makefile.nmake b/plugins/asn1/Makefile.nmake
index ec975503a7..b759db2b03 100644
--- a/plugins/asn1/Makefile.nmake
+++ b/plugins/asn1/Makefile.nmake
@@ -9,8 +9,9 @@ include moduleinfo.nmake
include Makefile.common
-CFLAGS=/WX /DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) \
- /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
+CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
+ /I../.. $(GLIB_CFLAGS) \
+ /I$(PCAP_DIR)\include
.c.obj::
$(CC) $(CFLAGS) -Fd.\ -c $<
diff --git a/plugins/docsis/Makefile.nmake b/plugins/docsis/Makefile.nmake
index d02da2ad4f..46034a0448 100644
--- a/plugins/docsis/Makefile.nmake
+++ b/plugins/docsis/Makefile.nmake
@@ -9,8 +9,9 @@ include moduleinfo.nmake
include Makefile.common
-CFLAGS=/WX /DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) \
- /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
+CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
+ /I../.. $(GLIB_CFLAGS) \
+ /I$(PCAP_DIR)\include
.c.obj::
$(CC) $(CFLAGS) -Fd.\ -c $<
diff --git a/plugins/easy_codec/Makefile.nmake b/plugins/easy_codec/Makefile.nmake
index 1d874407a8..42c3a70fc1 100644
--- a/plugins/easy_codec/Makefile.nmake
+++ b/plugins/easy_codec/Makefile.nmake
@@ -9,8 +9,9 @@ include moduleinfo.nmake
include Makefile.common
-CFLAGS=/WX /DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) \
- /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
+CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
+ /I../.. $(GLIB_CFLAGS) \
+ /I$(PCAP_DIR)\include
CPPFLAGS = $(CFLAGS) -TP
diff --git a/plugins/ethercat/Makefile.nmake b/plugins/ethercat/Makefile.nmake
index 2d485e1622..5a9810bd91 100644
--- a/plugins/ethercat/Makefile.nmake
+++ b/plugins/ethercat/Makefile.nmake
@@ -9,8 +9,9 @@ include moduleinfo.nmake
include Makefile.common
-CFLAGS=/WX /DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) \
- /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
+CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
+ /I../.. $(GLIB_CFLAGS) \
+ /I$(PCAP_DIR)\include
.c.obj::
$(CC) $(CFLAGS) -Fd.\ -c $<
diff --git a/plugins/giop/Makefile.nmake b/plugins/giop/Makefile.nmake
index 77cb68e354..ec34c47b92 100644
--- a/plugins/giop/Makefile.nmake
+++ b/plugins/giop/Makefile.nmake
@@ -6,8 +6,9 @@ include ..\..\config.nmake
############### no need to modify below this line #########
-CFLAGS=/WX /DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) \
- /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
+CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
+ /I../.. $(GLIB_CFLAGS) \
+ /I$(PCAP_DIR)\include
LDFLAGS = $(PLUGIN_LDFLAGS)
diff --git a/plugins/gryphon/Makefile.nmake b/plugins/gryphon/Makefile.nmake
index d02da2ad4f..46034a0448 100644
--- a/plugins/gryphon/Makefile.nmake
+++ b/plugins/gryphon/Makefile.nmake
@@ -9,8 +9,9 @@ include moduleinfo.nmake
include Makefile.common
-CFLAGS=/WX /DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) \
- /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
+CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
+ /I../.. $(GLIB_CFLAGS) \
+ /I$(PCAP_DIR)\include
.c.obj::
$(CC) $(CFLAGS) -Fd.\ -c $<
diff --git a/plugins/interlink/Makefile.nmake b/plugins/interlink/Makefile.nmake
index d02da2ad4f..46034a0448 100644
--- a/plugins/interlink/Makefile.nmake
+++ b/plugins/interlink/Makefile.nmake
@@ -9,8 +9,9 @@ include moduleinfo.nmake
include Makefile.common
-CFLAGS=/WX /DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) \
- /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
+CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
+ /I../.. $(GLIB_CFLAGS) \
+ /I$(PCAP_DIR)\include
.c.obj::
$(CC) $(CFLAGS) -Fd.\ -c $<
diff --git a/plugins/irda/Makefile.nmake b/plugins/irda/Makefile.nmake
index d02da2ad4f..46034a0448 100644
--- a/plugins/irda/Makefile.nmake
+++ b/plugins/irda/Makefile.nmake
@@ -9,8 +9,9 @@ include moduleinfo.nmake
include Makefile.common
-CFLAGS=/WX /DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) \
- /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
+CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
+ /I../.. $(GLIB_CFLAGS) \
+ /I$(PCAP_DIR)\include
.c.obj::
$(CC) $(CFLAGS) -Fd.\ -c $<
diff --git a/plugins/m2m/Makefile.nmake b/plugins/m2m/Makefile.nmake
index cf34ebbcd3..5b2e7c214f 100644
--- a/plugins/m2m/Makefile.nmake
+++ b/plugins/m2m/Makefile.nmake
@@ -9,8 +9,9 @@ include moduleinfo.nmake
include Makefile.common
-CFLAGS=/WX /DHAVE_CONFIG_H /I../.. /I../wimax $(GLIB_CFLAGS) \
- /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
+CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
+ /I../.. /I../wimax $(GLIB_CFLAGS) \
+ /I$(PCAP_DIR)\include
.c.obj::
$(CC) $(CFLAGS) -Fd.\ -c $<
diff --git a/plugins/mate/Makefile.nmake b/plugins/mate/Makefile.nmake
index 8e11dd6439..e56c2ec7ec 100644
--- a/plugins/mate/Makefile.nmake
+++ b/plugins/mate/Makefile.nmake
@@ -14,9 +14,12 @@ include Makefile.common
LEMON=..\..\tools\lemon
# We use GENERATED_CFLAGS to get around flex's non-LLP64-compliant output
-GENERATED_CFLAGS=/DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) /I$(LEMON)\
- /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
-CFLAGS=/WX $(GENERATED_CFLAGS)
+GENERATED_CFLAGS=\
+ $(STANDARD_CFLAGS) \
+ /I../.. $(GLIB_CFLAGS) /I$(LEMON) \
+ /I$(PCAP_DIR)\include
+
+CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS)
.c.obj::
$(CC) $(CFLAGS) -Fd.\ -c $<
diff --git a/plugins/opcua/Makefile.nmake b/plugins/opcua/Makefile.nmake
index d02da2ad4f..46034a0448 100644
--- a/plugins/opcua/Makefile.nmake
+++ b/plugins/opcua/Makefile.nmake
@@ -9,8 +9,9 @@ include moduleinfo.nmake
include Makefile.common
-CFLAGS=/WX /DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) \
- /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
+CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
+ /I../.. $(GLIB_CFLAGS) \
+ /I$(PCAP_DIR)\include
.c.obj::
$(CC) $(CFLAGS) -Fd.\ -c $<
diff --git a/plugins/profinet/Makefile.nmake b/plugins/profinet/Makefile.nmake
index d02da2ad4f..46034a0448 100644
--- a/plugins/profinet/Makefile.nmake
+++ b/plugins/profinet/Makefile.nmake
@@ -9,8 +9,9 @@ include moduleinfo.nmake
include Makefile.common
-CFLAGS=/WX /DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) \
- /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
+CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
+ /I../.. $(GLIB_CFLAGS) \
+ /I$(PCAP_DIR)\include
.c.obj::
$(CC) $(CFLAGS) -Fd.\ -c $<
diff --git a/plugins/sercosiii/Makefile.nmake b/plugins/sercosiii/Makefile.nmake
index d02da2ad4f..46034a0448 100644
--- a/plugins/sercosiii/Makefile.nmake
+++ b/plugins/sercosiii/Makefile.nmake
@@ -9,8 +9,9 @@ include moduleinfo.nmake
include Makefile.common
-CFLAGS=/WX /DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) \
- /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
+CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
+ /I../.. $(GLIB_CFLAGS) \
+ /I$(PCAP_DIR)\include
.c.obj::
$(CC) $(CFLAGS) -Fd.\ -c $<
diff --git a/plugins/stats_tree/Makefile.nmake b/plugins/stats_tree/Makefile.nmake
index ac66236bd9..b5077080ad 100644
--- a/plugins/stats_tree/Makefile.nmake
+++ b/plugins/stats_tree/Makefile.nmake
@@ -9,8 +9,9 @@ include moduleinfo.nmake
include Makefile.common
-CFLAGS=/WX /DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) \
- /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
+CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
+ /I../.. $(GLIB_CFLAGS) \
+ /I$(PCAP_DIR)\include
.c.obj::
$(CC) $(CFLAGS) -Fdstats_tree.pdb -c $<
diff --git a/plugins/tpg/Makefile.nmake b/plugins/tpg/Makefile.nmake
index 8085c54f85..ea11ef0681 100644
--- a/plugins/tpg/Makefile.nmake
+++ b/plugins/tpg/Makefile.nmake
@@ -9,8 +9,9 @@ include <win32.mak>
LEMON=..\..\tools\lemon
-CFLAGS=/WX /DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) /I$(LEMON)\
- /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
+CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
+ /I../.. $(GLIB_CFLAGS) /I$(LEMON) \
+ /I$(PCAP_DIR)\include
.c.obj::
$(CC) $(CFLAGS) -Fdmate.pdb -c $<
diff --git a/plugins/unistim/Makefile.nmake b/plugins/unistim/Makefile.nmake
index d02da2ad4f..46034a0448 100644
--- a/plugins/unistim/Makefile.nmake
+++ b/plugins/unistim/Makefile.nmake
@@ -9,8 +9,9 @@ include moduleinfo.nmake
include Makefile.common
-CFLAGS=/WX /DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) \
- /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
+CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
+ /I../.. $(GLIB_CFLAGS) \
+ /I$(PCAP_DIR)\include
.c.obj::
$(CC) $(CFLAGS) -Fd.\ -c $<
diff --git a/plugins/wimax/Makefile.nmake b/plugins/wimax/Makefile.nmake
index a89b9b6a3a..f37e894d55 100644
--- a/plugins/wimax/Makefile.nmake
+++ b/plugins/wimax/Makefile.nmake
@@ -9,8 +9,9 @@ include moduleinfo.nmake
include Makefile.common
-CFLAGS=/WX /DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) \
- /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
+CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
+ /I../.. $(GLIB_CFLAGS) \
+ /I$(PCAP_DIR)\include
.c.obj::
$(CC) $(CFLAGS) -Fd.\ -c $<
diff --git a/plugins/wimaxasncp/Makefile.nmake b/plugins/wimaxasncp/Makefile.nmake
index 209f2e8ec6..51b52a9af5 100644
--- a/plugins/wimaxasncp/Makefile.nmake
+++ b/plugins/wimaxasncp/Makefile.nmake
@@ -11,12 +11,12 @@ include ..\..\Makefile.nmake.inc
include Makefile.common
# We use GENERATED_CFLAGS to get around flex's non-LLP64-compliant output
-GENERATED_CFLAGS=/DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) \
- /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
-CFLAGS=/WX $(GENERATED_CFLAGS)
-
-
+GENERATED_CFLAGS=\
+ $(STANDARD_CFLAGS) \
+ /I../.. $(GLIB_CFLAGS) \
+ /I$(PCAP_DIR)\include
+CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS)
.c.obj::
$(CC) $(CFLAGS) -Fd.\ -c $<
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 14:01:39 +0000