diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2011-10-25 19:10:34 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2011-10-25 19:10:34 +0000 |
| commit | 993f5d3ccc457014a56a045ae830ac27e4b683e6 (patch) | |
| tree | 49d997749d83f3cc4b3f5afc20aa2b92db572ea1 /epan | |
| parent | 920eaae369533413f79770cd99ee2f3eafc99e6b (diff) | |
Make Custom.nmake usable.
(Should it be Custom_make.common or something like that)
svn path=/trunk/; revision=39574
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/Custom.nmake | 4 | ||||
| -rw-r--r-- | epan/dissectors/Makefile.common | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/epan/dissectors/Custom.nmake b/epan/dissectors/Custom.nmake index 6fcd1eeec1..162df0efb3 100644 --- a/epan/dissectors/Custom.nmake +++ b/epan/dissectors/Custom.nmake @@ -3,6 +3,6 @@ ## Here you can add custom dissectors # -CUSTOM_DISSECTOR_SRC = \ +CUSTOM_DISSECTOR_SRC = -CUSTOM_HEADER_FILES = \ +CUSTOM_HEADER_FILES = diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common index 4c9746948e..2b9490fb03 100644 --- a/epan/dissectors/Makefile.common +++ b/epan/dissectors/Makefile.common @@ -23,6 +23,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +include Custom.nmake + # "BUILT_SOURCES" are built before any "make all" or "make check" targets. BUILT_C_FILES = \ register.c @@ -1048,7 +1050,8 @@ DISSECTOR_SRC = \ packet-zebra.c \ packet-zep.c \ packet-ziop.c \ - packet-zrtp.c + packet-zrtp.c \ + $(CUSTOM_DISSECTOR_SRC) # # Headers for dissectors. @@ -1433,5 +1436,4 @@ ALL_DISSECTORS_SRC = \ $(PIDL_DISSECTOR_SRC) \ $(DIRTY_PIDL_DISSECTOR_SRC) \ $(ASN1_DISSECTOR_SRC) \ - $(DIRTY_ASN1_DISSECTOR_SRC) \ - $(CUSTOM_DISSECTOR_SRC) + $(DIRTY_ASN1_DISSECTOR_SRC) |