From e30d2b5001ae68f7d71e20f290f5a6116243994f Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Sat, 9 Feb 2013 05:31:15 +0000 Subject: Make the other plugin makefiles use the new style introduced in the MATE makefiles. svn path=/trunk/; revision=47579 --- plugins/unistim/Makefile.am | 22 +++++++++++++--------- plugins/unistim/Makefile.common | 16 +++++++++++++--- plugins/unistim/Makefile.nmake | 23 +++++++++++------------ 3 files changed, 37 insertions(+), 24 deletions(-) (limited to 'plugins/unistim') diff --git a/plugins/unistim/Makefile.am b/plugins/unistim/Makefile.am index eb5d1ed48b..32974faa31 100644 --- a/plugins/unistim/Makefile.am +++ b/plugins/unistim/Makefile.am @@ -23,7 +23,9 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -INCLUDES = -I$(top_srcdir) -I$(includedir) +include $(top_srcdir)/Makefile.am.inc + +INCLUDES = -I$(top_srcdir) include Makefile.common @@ -34,12 +36,13 @@ endif plugindir = @plugindir@ plugin_LTLIBRARIES = unistim.la + unistim_la_SOURCES = \ plugin.c \ moduleinfo.h \ - $(DISSECTOR_SRC) \ - $(DISSECTOR_SUPPORT_SRC) \ - $(DISSECTOR_INCLUDES) + $(SRC_FILES) \ + $(HEADER_FILES) + unistim_la_LDFLAGS = -module -avoid-version unistim_la_LIBADD = @PLUGIN_LIBS@ @@ -63,7 +66,7 @@ LIBS = # 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 @@ -81,16 +84,16 @@ LIBS = # a plugin.c file for a plugin. # All subsequent arguments are the files to scan. # -plugin.c: $(DISSECTOR_SRC) Makefile.common $(top_srcdir)/tools/make-dissector-reg \ +plugin.c: $(REGISTER_SRC_FILES) Makefile.common $(top_srcdir)/tools/make-dissector-reg \ $(top_srcdir)/tools/make-dissector-reg.py @if test -n "$(PYTHON)"; then \ echo Making plugin.c with python ; \ $(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \ - plugin $(DISSECTOR_SRC) ; \ + plugin $(REGISTER_SRC_FILES) ; \ else \ echo Making plugin.c with shell script ; \ $(top_srcdir)/tools/make-dissector-reg $(srcdir) \ - $(plugin_src) plugin $(DISSECTOR_SRC) ; \ + $(plugin_src) plugin $(REGISTER_SRC_FILES) ; \ fi # @@ -128,4 +131,5 @@ EXTRA_DIST = \ checkapi: - $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) + $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \ + $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/plugins/unistim/Makefile.common b/plugins/unistim/Makefile.common index 873fd1f30f..e0b8bde53c 100644 --- a/plugins/unistim/Makefile.common +++ b/plugins/unistim/Makefile.common @@ -27,11 +27,16 @@ # the name of the plugin PLUGIN_NAME = unistim -# the dissector sources (without any helpers) -DISSECTOR_SRC = \ +# Non-generated sources to be scanned for registration routines +NONGENERATED_REGISTER_C_FILES = \ packet-unistim.c -DISSECTOR_INCLUDES = \ +# Non-generated sources +NONGENERATED_C_FILES = \ + $(NONGENERATED_REGISTER_C_FILES) + +# Headers. +CLEAN_HEADER_FILES = \ audio.h \ basic.h \ broadcast.h \ @@ -42,3 +47,8 @@ DISSECTOR_INCLUDES = \ network.h \ uftp.h \ packet-unistim.h + +HEADER_FILES = \ + $(CLEAN_HEADER_FILES) + +include ../Makefile.common.inc diff --git a/plugins/unistim/Makefile.nmake b/plugins/unistim/Makefile.nmake index fecc441c15..52994732ff 100644 --- a/plugins/unistim/Makefile.nmake +++ b/plugins/unistim/Makefile.nmake @@ -1,10 +1,12 @@ # Makefile.nmake -# nmake file for Wireshark plugin +# nmake file for Unistim 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) -- cgit v1.2.3