aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/Makefile.inc
diff options
context:
space:
mode:
authorrichardv <richardv@f5534014-38df-0310-8fa8-9805f1628bb7>2007-10-05 14:45:21 +0000
committerrichardv <richardv@f5534014-38df-0310-8fa8-9805f1628bb7>2007-10-05 14:45:21 +0000
commit34cce6315bfc8e016b97b89943f16f1972219ca4 (patch)
tree303c4a1702498f8d34e6347c5290f0775c65736a /asn1/Makefile.inc
parent6b66d85173d1542f3bce6714e1eb913e95a25632 (diff)
hopefully this will do what Thomas wants for NO_PROTO_OPT
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23074 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'asn1/Makefile.inc')
-rw-r--r--asn1/Makefile.inc11
1 files changed, 5 insertions, 6 deletions
diff --git a/asn1/Makefile.inc b/asn1/Makefile.inc
index 2610370ba0..b58a7f4fe0 100644
--- a/asn1/Makefile.inc
+++ b/asn1/Makefile.inc
@@ -21,17 +21,16 @@
# 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)
-# commented out till it is fixed
-#if NO_PROTO_OPT
-#PROTO_OPT =
-#else
-PROTO_OPT = -p $(PROTOCOL_NAME)
-#endif
$(DISSECTOR_FILES): $(top_srcdir)/tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF)
python $(top_srcdir)/tools/asn2wrs.py \