diff options
| author | kukosa <kukosa@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-10-15 18:44:53 +0000 |
|---|---|---|
| committer | kukosa <kukosa@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-10-15 18:44:53 +0000 |
| commit | 298b2463a9f502f5da9a883d97586e79de2088b0 (patch) | |
| tree | 0777130b42875e956a818569f8683f8f511c43f8 /asn1/h225 | |
| parent | c2a7dee2206baadb49ecd2257a5dc83a74ae96f3 (diff) | |
- add missing h450-ros and q932-ros clean rules to asn1/Makefile.nmake
- solve h225<->h235 cyclic dependency with usage of -E option and #.IMPORT directive
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23189 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'asn1/h225')
| -rw-r--r-- | asn1/h225/Makefile.common | 4 | ||||
| -rw-r--r-- | asn1/h225/h225.cnf | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/asn1/h225/Makefile.common b/asn1/h225/Makefile.common index 0bea93dc1f..a0e5e03dce 100644 --- a/asn1/h225/Makefile.common +++ b/asn1/h225/Makefile.common @@ -49,7 +49,9 @@ SRC_FILES = \ A2W_FLAGS= -e -EXTRA_CNF= \ +EXTRA_CNF = + +IMPORT_CNF = \ ../h235/h235-exp.cnf \ ../h245/h245-exp.cnf diff --git a/asn1/h225/h225.cnf b/asn1/h225/h225.cnf index bac9f1e2a0..146f7b5742 100644 --- a/asn1/h225/h225.cnf +++ b/asn1/h225/h225.cnf @@ -3,14 +3,14 @@ # Copyright 2004 Anders Broman # $Id$ -#.INCLUDE ../h235/h235-exp.cnf +#.IMPORT ../h235/h235-exp.cnf #.TYPE_ATTR # override TransportAddress from H.245 # temporary solution till collision between imported and defined type is solved in the asn2wrs TransportAddress TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h225_TransportAddress_vals) BITMASK = 0 #.END -#.INCLUDE ../h245/h245-exp.cnf +#.IMPORT ../h245/h245-exp.cnf #---------------------------------------------------------------------------------------- #.EXPORTS ONLY_VALS WS_VAR NO_PROT_PREFIX |