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/asn1 | |
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/asn1')
-rw-r--r-- | plugins/asn1/Makefile.am | 24 | ||||
-rw-r--r-- | plugins/asn1/Makefile.common | 26 | ||||
-rw-r--r-- | plugins/asn1/Makefile.nmake | 23 |
3 files changed, 43 insertions, 30 deletions
diff --git a/plugins/asn1/Makefile.am b/plugins/asn1/Makefile.am index f23f3ae074..21aebd2229 100644 --- a/plugins/asn1/Makefile.am +++ b/plugins/asn1/Makefile.am @@ -22,7 +22,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 @@ -30,13 +32,16 @@ if HAVE_WARNINGS_AS_ERRORS AM_CFLAGS = -Werror endif +plugindir = @plugindir@ + plugin_LTLIBRARIES = asn1.la + asn1_la_SOURCES = \ plugin.c \ moduleinfo.h \ - $(DISSECTOR_SRC) \ - $(DISSECTOR_SUPPORT_SRC) \ - $(DISSECTOR_INCLUDES) + $(SRC_FILES) \ + $(HEADER_FILES) + asn1_la_LDFLAGS = -module -avoid-version asn1_la_LIBADD = @PLUGIN_LIBS@ @@ -60,7 +65,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 @@ -78,16 +83,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 # @@ -124,4 +129,5 @@ EXTRA_DIST = \ CMakeLists.txt 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/asn1/Makefile.common b/plugins/asn1/Makefile.common index 8f2dcc4d8d..45f0a8a46a 100644 --- a/plugins/asn1/Makefile.common +++ b/plugins/asn1/Makefile.common @@ -26,16 +26,24 @@ # the name of the plugin PLUGIN_NAME = asn1 -# the dissector sources (without any helpers) -DISSECTOR_SRC = \ +# Non-generated sources to be scanned for registration routines +NONGENERATED_REGISTER_C_FILES = \ packet-asn1.c -# corresponding headers -DISSECTOR_INCLUDES = \ +# Non-generated sources +NONGENERATED_C_FILES = \ + $(NONGENERATED_REGISTER_C_FILES) \ + asn1.c + +# Headers. +CLEAN_HEADER_FILES = \ asn1.h -# Dissector helpers. They're included in the source files in this -# directory, but they're not dissectors themselves, i.e. they're not -# used to generate "register.c"). -DISSECTOR_SUPPORT_SRC = \ - asn1.c +HEADER_FILES = \ + $(FLEX_GENERATED_HEADER_FILES) \ + $(CLEAN_HEADER_FILES) + +NODIST_HEADER_FILES = \ + $(LEMON_GENERATED_HEADER_FILES) + +include ../Makefile.common.inc diff --git a/plugins/asn1/Makefile.nmake b/plugins/asn1/Makefile.nmake index 075e7dbd8f..092616b58c 100644 --- a/plugins/asn1/Makefile.nmake +++ b/plugins/asn1/Makefile.nmake @@ -1,10 +1,12 @@ # Makefile.nmake -# nmake file for Wireshark plugin +# nmake file for ASN.1 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 ..\..\wsutil\libwsutil.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 @@ -102,4 +100,5 @@ maintainer-clean: distclean checkapi: # TODO: Fix api's :) -# $(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) |