- 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

diff --git a/asn1/Makefile.nmake b/asn1/Makefile.nmake
index 6f104140c8c26134ad28242d55098c274ab81e1d..2f1bb7092f57aa094c2f2704cbf16a31e9079b54 100644 (file)
--- a/asn1/Makefile.nmake
+++ b/asn1/Makefile.nmake
@@ -156,6 +156,9 @@ clean:
        cd h450
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
        cd ..
+       cd h450-ros
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
+       cd ..
        cd inap
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
        cd ..
@@ -219,6 +222,9 @@ clean:
        cd q932
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
        cd ..
+       cd q932-ros
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
+       cd ..
        cd qsig
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
        cd ..

diff --git a/asn1/h225/Makefile.common b/asn1/h225/Makefile.common
index 0bea93dc1f3791d33efe8fb8327cf907eff3742d..a0e5e03dce26311b1dade08644b33fbd2b193187 100644 (file)
--- 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 bac9f1e2a0ddc4df88b43748ba8d73d555550589..146f7b574205336fd0b56de1b1bc85c6f2c0f0a4 100644 (file)
--- 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

diff --git a/asn1/h235/Makefile.common b/asn1/h235/Makefile.common
index 5a3e8cbc5bc7d51960c2b11c9ab7ae765522936d..f9a8961ed766f811d2459118ae4105578fa0e53f 100644 (file)
--- 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 e8000f16124fd2ae3803f41648c5a7004ccb8d72..5681c06d57c4101ee898bbef7374a9d6a8c8cbd0 100644 (file)
--- 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