diff options
| author | Tomas Kukosa <tomas.kukosa@siemens.com> | 2007-10-09 08:50:35 +0000 |
|---|---|---|
| committer | Tomas Kukosa <tomas.kukosa@siemens.com> | 2007-10-09 08:50:35 +0000 |
| commit | d93976accad7b34e34963dd68ed0d92c855becc4 (patch) | |
| tree | 70fc0870893010bab5980d8d8182fef1ce5d4cc4 /asn1 | |
| parent | 3cc99bbe53b1c923efed9e7e5671e14414ea3b2b (diff) | |
remove rule for $(EXTRA_CNF) as ros/ros-{inv,res,err,rej}.cnf are not generated
minor changes
svn path=/trunk/; revision=23108
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/h450-ros/Makefile.common | 15 | ||||
| -rw-r--r-- | asn1/h450/Makefile.common | 3 |
2 files changed, 7 insertions, 11 deletions
diff --git a/asn1/h450-ros/Makefile.common b/asn1/h450-ros/Makefile.common index 72209cef64..3e731d9898 100644 --- a/asn1/h450-ros/Makefile.common +++ b/asn1/h450-ros/Makefile.common @@ -20,12 +20,13 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -PROTOCOL_NAME=h450-ros +PROTOCOL_NAME = h450-ros # The file needs to use h450 for the filter elements etc PROTO_OPT = -p h450.ros -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ +DISSECTOR_FILES = \ + packet-$(PROTOCOL_NAME).c \ packet-$(PROTOCOL_NAME).h NEED_PACKET_PROTO_H = 1 @@ -46,16 +47,10 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -# -o needed to compensate the -p h450 hack above. -A2W_FLAGS= -e -o $(PROTOCOL_NAME) +A2W_FLAGS= -e -EXTRA_CNF= \ +EXTRA_CNF = \ ../ros/ros-inv.cnf \ ../ros/ros-res.cnf \ ../ros/ros-err.cnf \ ../ros/ros-rej.cnf - - -$(EXTRA_CNF): - (cd ../ros && $(MAKE) $(MAKEFLAGS)) - diff --git a/asn1/h450/Makefile.common b/asn1/h450/Makefile.common index ea2328c5d9..e9981bc777 100644 --- a/asn1/h450/Makefile.common +++ b/asn1/h450/Makefile.common @@ -24,9 +24,10 @@ PROTOCOL_NAME=h450 DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c +# need empty -p <proto> option, default is -p $(PROTOCOL_NAME) PROTO_OPT = -# NEED_PACKET_PROTO_H = 1 +NEED_PACKET_PROTO_H = 0 EXT_ASN_FILE_LIST = |