diff options
author | Gerald Combs <gerald@wireshark.org> | 2007-10-05 21:38:59 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2007-10-05 21:38:59 +0000 |
commit | 931b03d6917ddd3a822d2160b699e1e1f3ea1d46 (patch) | |
tree | 6265f83b95ea815089f1fd462cacdb4c9d76cfcb /asn1/Makefile.inc | |
parent | d3600969fb27001783baff469198e5ef562895d2 (diff) |
In the various Makefiles, remove checks for NO_PROTO_OPT and allow PROT_OPT
to be overridden further up the chain, e.g. in Makefile.common
svn path=/trunk/; revision=23076
Diffstat (limited to 'asn1/Makefile.inc')
-rw-r--r-- | asn1/Makefile.inc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/asn1/Makefile.inc b/asn1/Makefile.inc index b58a7f4fe0..a5900c0563 100644 --- a/asn1/Makefile.inc +++ b/asn1/Makefile.inc @@ -21,16 +21,11 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -ifdef NO_PROTO_OPT -PROTO_OPT = -else -PROTO_OPT = -p $(PROTOCOL_NAME) -endif - all: generate_dissector generate_dissector: $(DISSECTOR_FILES) +PROTO_OPT ?= -p $(PROTOCOL_NAME) $(DISSECTOR_FILES): $(top_srcdir)/tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF) python $(top_srcdir)/tools/asn2wrs.py \ |