aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/h235
diff options
context:
space:
mode:
authorTomas Kukosa <tomas.kukosa@siemens.com>2007-10-15 18:44:53 +0000
committerTomas Kukosa <tomas.kukosa@siemens.com>2007-10-15 18:44:53 +0000
commit5ba3d8aaaa3311f4917889c6d191ce33ca30cd71 (patch)
tree0777130b42875e956a818569f8683f8f511c43f8 /asn1/h235
parent721796617d2f4353eef25b1e08945951917c4e65 (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 svn path=/trunk/; revision=23189
Diffstat (limited to 'asn1/h235')
-rw-r--r--asn1/h235/Makefile.common8
-rw-r--r--asn1/h235/h235.cnf2
2 files changed, 8 insertions, 2 deletions
diff --git a/asn1/h235/Makefile.common b/asn1/h235/Makefile.common
index 5a3e8cbc5b..f9a8961ed7 100644
--- a/asn1/h235/Makefile.common
+++ b/asn1/h235/Makefile.common
@@ -49,5 +49,11 @@ SRC_FILES = \
A2W_FLAGS = -e
-EXTRA_CNF=
+EXTRA_CNF =
+
+IMPORT_CNF = \
+ ../h225/h225-exp.cnf
+
+../h225/h225-exp.cnf:
+ (cd ../h235 && $(MAKE_CNF_EXPORT))
diff --git a/asn1/h235/h235.cnf b/asn1/h235/h235.cnf
index e8000f1612..5681c06d57 100644
--- a/asn1/h235/h235.cnf
+++ b/asn1/h235/h235.cnf
@@ -4,7 +4,7 @@
# $Id$
-#.INCLUDE ../h225/h225-exp.cnf
+#.IMPORT ../h225/h225-exp.cnf
#.EXPORTS