diff options
author | Guy Harris <guy@alum.mit.edu> | 2013-02-09 05:31:15 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2013-02-09 05:31:15 +0000 |
commit | e30d2b5001ae68f7d71e20f290f5a6116243994f (patch) | |
tree | 2d000509f1b77ca60727b9d7340df7b73128ad80 /plugins/docsis/Makefile.nmake | |
parent | 4aae84271d346f95a68225aefd84207aa4505679 (diff) |
Make the other plugin makefiles use the new style introduced in the MATE
makefiles.
svn path=/trunk/; revision=47579
Diffstat (limited to 'plugins/docsis/Makefile.nmake')
-rw-r--r-- | plugins/docsis/Makefile.nmake | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/plugins/docsis/Makefile.nmake b/plugins/docsis/Makefile.nmake index fecc441c15..6b6670acc4 100644 --- a/plugins/docsis/Makefile.nmake +++ b/plugins/docsis/Makefile.nmake @@ -1,10 +1,12 @@ # Makefile.nmake -# nmake file for Wireshark plugin +# nmake file for DOCSIS plugin # # $Id$ # include ..\..\config.nmake +include ..\..\Makefile.nmake.inc + include moduleinfo.nmake include Makefile.common @@ -22,11 +24,7 @@ LDFLAGS = $(PLUGIN_LDFLAGS) LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib CFLAGS=/D_NEED_VAR_IMPORT_ $(CFLAGS) -DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj) - -DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_SRC:.c=.obj) - -OBJECTS = $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) plugin.obj +OBJECTS = $(C_FILES:.c=.obj) $(CPP_FILES:.cpp=.obj) plugin.obj RESOURCE=$(PLUGIN_NAME).res @@ -61,7 +59,7 @@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLU # preceded only by "void " starting in column zero, and must not be # inside #if. # -# DISSECTOR_SRC is assumed to have all the files that need to be scanned. +# REGISTER_SRC_FILES is assumed to have all the files that need to be scanned. # # For some unknown reason, having a big "for" loop in the Makefile # to scan all the files doesn't work with some "make"s; they seem to @@ -80,13 +78,13 @@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLU # All subsequent arguments are the files to scan. # !IFDEF PYTHON -plugin.c: $(DISSECTOR_SRC) moduleinfo.h Makefile.common ../../tools/make-dissector-reg.py +plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg.py @echo Making plugin.c (using python) - @$(PYTHON) "../../tools/make-dissector-reg.py" . plugin $(DISSECTOR_SRC) + @$(PYTHON) "../../tools/make-dissector-reg.py" . plugin $(REGISTER_SRC_FILES) !ELSE -plugin.c: $(DISSECTOR_SRC) moduleinfo.h Makefile.common ../../tools/make-dissector-reg +plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg @echo Making plugin.c (using sh) - @$(SH) ../../tools/make-dissector-reg . plugin $(DISSECTOR_SRC) + @$(SH) ../../tools/make-dissector-reg . plugin $(REGISTER_SRC_FILES) !ENDIF !ENDIF @@ -101,4 +99,5 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput -build $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput -build \ + $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) |