Make the other plugin makefiles use the new style introduced in the MATE

makefiles.

svn path=/trunk/; revision=47579

2 files changed, 33 insertions, 11 deletions

diff --git a/plugins/easy_codec/Makefile.common b/plugins/easy_codec/Makefile.common
index be51658378..52e849f011 100644
--- a/plugins/easy_codec/Makefile.common
+++ b/plugins/easy_codec/Makefile.common
@@ -1,4 +1,4 @@
-# Makefile.common for stats tree plugin
+# Makefile.common for Easy codec plugin
 #     Contains the stuff from Makefile.am and Makefile.nmake that is
 #     a) common to both files and
 #     b) portable between both files
@@ -26,17 +26,24 @@
 # the name of the plugin
 PLUGIN_NAME = easy_codec
 
-# the codec sources 
-CODEC_SRC = \
+# Non-generated sources
+NONGENERATED_C_FILES = \
 	easy_codec_plugin.c	\
 	codec-g729a.c \
 	codec-g7231.c \
 	codec-g722.c
 
-CODEC_INCLUDES = \
+# Headers.
+CLEAN_HEADER_FILES = \
 	codec-g729a.h \
 	codec-g7231.h \
 	codec-g722.h
 
+HEADER_FILES = \
+	$(FLEX_GENERATED_HEADER_FILES) \
+	$(CLEAN_HEADER_FILES)
 
+NODIST_HEADER_FILES = \
+	$(LEMON_GENERATED_HEADER_FILES)
 
+include ../Makefile.common.inc
diff --git a/plugins/easy_codec/Makefile.nmake b/plugins/easy_codec/Makefile.nmake
index 374c642f37..bb938259df 100644
--- a/plugins/easy_codec/Makefile.nmake
+++ b/plugins/easy_codec/Makefile.nmake
@@ -1,10 +1,12 @@
 # Makefile.nmake
-# nmake file for codec_test plugin
+# nmake file for Easy codec plugin
 #
 # $Id$
 #
 
 include ..\..\config.nmake
+include ..\..\Makefile.nmake.inc
+
 include moduleinfo.nmake
 
 include Makefile.common
@@ -24,15 +26,13 @@ LDFLAGS = $(PLUGIN_LDFLAGS)
 LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
 CFLAGS=/D_NEED_VAR_IMPORT_ $(CFLAGS)
 
-CODEC_OBJECTS = $(CODEC_SRC:.c=.obj)
+OBJECTS = $(C_FILES:.c=.obj) $(CPP_FILES:.cpp=.obj) plugin.obj
 
 CODEC_LIBS = \
 	EasyG729A/EasyG729A.lib \
 	EasyG7231/EasyG7231.lib \
 	EasyG722/EasyG722.lib
 
-OBJECTS=$(CODEC_OBJECTS)
-
 RESOURCE=$(PLUGIN_NAME).res
 
 all: $(PLUGIN_NAME).dll
@@ -57,12 +57,27 @@ easy_codec_plugin.obj : easy_codec_plugin.c
 !ENDIF
 
 clean:
-	rm -f $(OBJECTS) $(PLUGIN_NAME).dll $(PLUGIN_NAME).dll.manifest $(PLUGIN_NAME).exp \
-	    $(RESOURCE) $(PLUGIN_NAME).rc $(PLUGIN_NAME).lib *.pdb *.sbr
+	rm -f $(OBJECTS) $(RESOURCE) plugin.c  *.pdb *.sbr \
+	    $(PLUGIN_NAME).dll $(PLUGIN_NAME).dll.manifest $(PLUGIN_NAME).lib \
+	    $(PLUGIN_NAME).exp $(PLUGIN_NAME).rc
 
+#
+# We remove the Flex-generated files with "distclean" because files
+# generated by Flex need different #includes for UN*X and Windows (UN*X
+# versions of Flex make it include <unistd.h>, but that's a UN*X-only
+# header), so if you're going to build from source, you need to re-generate
+# the files from the distribution that were generated by Flex.
+#
 distclean: clean
+	rm -f $(FLEX_GENERATED_SRC_FILES) \
+		$(FLEX_GENERATED_HEADER_FILES) \
+		$(NODIST_GENERATED_SRC_FILES) \
+		$(NODIST_GENERATED_HEADER_FILES)
 
 maintainer-clean: distclean
+	rm -f $(GENERATED_SRC_FILES) \
+		$(GENERATED_HEADER_FILES)
 
 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)