3 files changed, 27 insertions, 13 deletions
diff --git a/plugins/stats_tree/Makefile.am b/plugins/stats_tree/Makefile.am
index c5092e5501..e33efafebd 100644
--- a/plugins/stats_tree/Makefile.am
+++ b/plugins/stats_tree/Makefile.am
@@ -22,6 +22,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
+include $(top_srcdir)/Makefile.am.inc
+
 INCLUDES = -I$(top_srcdir)
 
 include Makefile.common
@@ -33,7 +35,11 @@ endif
 plugindir = @plugindir@
 
 plugin_LTLIBRARIES = stats_tree.la
-stats_tree_la_SOURCES = $(TAP_SRC) $(TAP_INCLUDES)
+
+stats_tree_la_SOURCES = \
+	$(SRC_FILES)	\
+	$(HEADER_FILES)
+
 stats_tree_la_LDFLAGS = -module -avoid-version
 stats_tree_la_LIBADD = @PLUGIN_LIBS@
 
@@ -47,8 +53,7 @@ CLEANFILES = \
 	*~
 
 MAINTAINERCLEANFILES = \
-	Makefile.in	\
-	plugin.c
+	Makefile.in
 
 EXTRA_DIST = \
 	Makefile.common		\
@@ -58,4 +63,5 @@ EXTRA_DIST = \
 	CMakeLists.txt
 
 checkapi:
-	$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build $(TAP_SRC) $(TAP_INCLUDES)
+	$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \
+		$(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES)
diff --git a/plugins/stats_tree/Makefile.common b/plugins/stats_tree/Makefile.common
index e81f4f4754..da461d8097 100644
--- a/plugins/stats_tree/Makefile.common
+++ b/plugins/stats_tree/Makefile.common
@@ -26,11 +26,17 @@
 # the name of the plugin
 PLUGIN_NAME = stats_tree
 
-# the tap sources 
-TAP_SRC = \
+# Non-generated sources
+NONGENERATED_C_FILES = \
+	$(NONGENERATED_REGISTER_C_FILES) \
 	stats_tree_plugin.c	\
 	pinfo_stats_tree.c
 
-TAP_INCLUDES = \
+# Headers.
+CLEAN_HEADER_FILES = \
 	pinfo_stats_tree.h
 
+HEADER_FILES = \
+	$(CLEAN_HEADER_FILES)
+
+include ../Makefile.common.inc
diff --git a/plugins/stats_tree/Makefile.nmake b/plugins/stats_tree/Makefile.nmake
index a600a68a86..8d46eea541 100644
--- a/plugins/stats_tree/Makefile.nmake
+++ b/plugins/stats_tree/Makefile.nmake
@@ -5,6 +5,8 @@
 #
 
 include ..\..\config.nmake
+include ..\..\Makefile.nmake.inc
+
 include moduleinfo.nmake
 
 include Makefile.common
@@ -22,9 +24,7 @@ LDFLAGS = $(PLUGIN_LDFLAGS)
 LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
 CFLAGS=/D_NEED_VAR_IMPORT_ $(CFLAGS)
 
-TAP_OBJECTS = $(TAP_SRC:.c=.obj)
-
-OBJECTS=$(TAP_OBJECTS)
+OBJECTS = $(C_FILES:.c=.obj) $(CPP_FILES:.cpp=.obj) plugin.obj
 
 RESOURCE=$(PLUGIN_NAME).res
 
@@ -47,12 +47,14 @@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLU
 !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
 
 distclean: clean
 
 maintainer-clean: distclean
 
 checkapi:
-	$(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput -build $(TAP_SRC) $(TAP_INCLUDES)
+	$(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput -build \
+		$(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES)