- Fix svn:ignore for all directories

- gsmmap: uncomment -s option in gsmmap.cnf - Fix cyclic dependencies: + Remove EXPORT_CNF from dependencies for cnf files + Replace all INCLUDE ...-exp.cnf with IMPORT ...-exp.cnf svn path=/trunk/; revision=23202
author: Jörg Mayer <jmayer@loplof.de> 2007-10-16 13:59:40 +0000
committer: Jörg Mayer <jmayer@loplof.de> 2007-10-16 13:59:40 +0000
commit: c2d0c8fa3161a00dfa3942d55cb60de677ba9c9b (patch)
tree: 1bc554069aa8a26b7fc84961ac447b8fe7d120b4
parent: 254a5ad7059c6eb3eba980abc624a4b62487ada2 (diff)
41 files changed, 98 insertions, 106 deletions
diff --git a/asn1/Makefile.inc b/asn1/Makefile.inc
index 7b574a7226..2582fece7c 100644
--- a/asn1/Makefile.inc
+++ b/asn1/Makefile.inc
@@ -29,7 +29,7 @@ generate_export: $(EXPORT_FILES)
 
 PROTO_OPT ?= -p $(PROTOCOL_NAME)
 
-$(DISSECTOR_FILES): $(top_srcdir)/tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF) $(IMPORT_CNF)
+$(DISSECTOR_FILES): $(top_srcdir)/tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF)
 	python $(top_srcdir)/tools/asn2wrs.py \
 		$(A2W_FLAGS) \
 		$(PROTO_OPT) \
@@ -38,15 +38,13 @@ $(DISSECTOR_FILES): $(top_srcdir)/tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF) $(I
 		-D $(srcdir) \
 		$(EXT_ASN_FILE_LIST) $(ASN_FILE_LIST) $(EXT_ASN_FILE_LIST_LATE)
 
-#ifdef EXPORT_FILES
-#$(EXPORT_FILES): $(top_srcdir)/tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF)
-#	python $(top_srcdir)/tools/asn2wrs.py \
-#		-E $(A2W_FLAGS) \
-#		$(PROTO_OPT) \
-#		-c $(srcdir)/$(PROTOCOL_NAME).cnf \
-#		-D $(srcdir) \
-#		$(EXT_ASN_FILE_LIST) $(ASN_FILE_LIST) $(EXT_ASN_FILE_LIST_LATE)
-#endif
+$(EXPORT_FILES): $(top_srcdir)/tools/asn2wrs.py $(SRC_FILES)
+	python $(top_srcdir)/tools/asn2wrs.py \
+		-E $(A2W_FLAGS) \
+		$(PROTO_OPT) \
+		-c $(srcdir)/$(PROTOCOL_NAME).cnf \
+		-D $(srcdir) \
+		$(EXT_ASN_FILE_LIST) $(ASN_FILE_LIST) $(EXT_ASN_FILE_LIST_LATE)
 
 copy_files: generate_dissector
 	cp $(DISSECTOR_FILES) $(top_srcdir)/epan/dissectors/
@@ -56,5 +54,5 @@ CLEANFILES = \
 	parsetab.pyc \
 	$(DISSECTOR_FILES) \
 	*-exp.cnf \
-	packet-*-{dis-tab,ettarr,ett,fn,hfarr,hf,table*,val}.[hc]
+	packet-*-{dis-tab,ettarr,ett,fn,hfarr,hf,table*,val,exp}.[hc]
 
diff --git a/asn1/Makefile.inc.nmake b/asn1/Makefile.inc.nmake
index 7ca91b2438..b0f0a87696 100644
--- a/asn1/Makefile.inc.nmake
+++ b/asn1/Makefile.inc.nmake
@@ -36,7 +36,7 @@ generate_export: $(EXPORT_FILES)
 PROTO_OPT = -p $(PROTOCOL_NAME)
 !ENDIF
 
-$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF) $(IMPORT_CNF)
+$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF)
 !IFDEF PYTHON
 	$(PYTHON) "../../tools/asn2wrs.py" \
 		$(A2W_FLAGS) \
@@ -50,7 +50,7 @@ $(DISSECTOR_FILES): ../../tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF) $(IMPORT_CN
 !ENDIF
 
 !IFDEF EXPORT_FILES
-$(EXPORT_FILES): ../../tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF)
+$(EXPORT_FILES): ../../tools/asn2wrs.py $(SRC_FILES)
 !IFDEF PYTHON
 	$(PYTHON) "../../tools/asn2wrs.py" \
 		-E $(A2W_FLAGS) \
diff --git a/asn1/acp133/acp133.cnf b/asn1/acp133/acp133.cnf
index 740d26c18c..9a60832cc9 100644
--- a/asn1/acp133/acp133.cnf
+++ b/asn1/acp133/acp133.cnf
@@ -1,10 +1,10 @@
 # acp133.cnf
 # ACP133 conformation file
 
-#.INCLUDE ../x509ce/x509ce-exp.cnf
-#.INCLUDE ../x509if/x509if-exp.cnf
-#.INCLUDE ../x509af/x509af-exp.cnf
-#.INCLUDE ../x411/x411-exp.cnf
+#.IMPORT ../x509ce/x509ce-exp.cnf
+#.IMPORT ../x509if/x509if-exp.cnf
+#.IMPORT ../x509af/x509af-exp.cnf
+#.IMPORT ../x411/x411-exp.cnf
 
 #.MODULE_IMPORT
 MTSAbstractService 	x411
diff --git a/asn1/acse/acse.cnf b/asn1/acse/acse.cnf
index 9177aa3fdf..0962c77565 100644
--- a/asn1/acse/acse.cnf
+++ b/asn1/acse/acse.cnf
@@ -3,7 +3,7 @@
 
 # $Id$
 
-#.INCLUDE ../x509if/x509if-exp.cnf
+#.IMPORT ../x509if/x509if-exp.cnf
 
 #.EXPORTS
 EXTERNALt
diff --git a/asn1/ansi_map/ansi_map.cnf b/asn1/ansi_map/ansi_map.cnf
index 78057a959b..4878b54bb1 100644
--- a/asn1/ansi_map/ansi_map.cnf
+++ b/asn1/ansi_map/ansi_map.cnf
@@ -3,7 +3,7 @@
 # Copyright 2005-2007 Anders Broman 
 # $Id$
 
-#.INCLUDE ../gsmmap/gsm_map-exp.cnf
+#.IMPORT ../gsmmap/gsm_map-exp.cnf
 #.EXPORTS
 
 
diff --git a/asn1/camel/camel.cnf b/asn1/camel/camel.cnf
index 1325d16f58..9ee0af45ac 100644
--- a/asn1/camel/camel.cnf
+++ b/asn1/camel/camel.cnf
@@ -3,8 +3,8 @@
 # Anders Broman 2007
 # $Id$
 
-#.INCLUDE ../gsmmap/gsm_map-exp.cnf
-#.INCLUDE ../inap/inap-exp.cnf
+#.IMPORT ../gsmmap/gsm_map-exp.cnf
+#.IMPORT ../inap/inap-exp.cnf
 
 #.MODULE
 CS1-DataTypes  inap
diff --git a/asn1/cmip/cmip.cnf b/asn1/cmip/cmip.cnf
index 64b5e14f10..a1c120ea0c 100644
--- a/asn1/cmip/cmip.cnf
+++ b/asn1/cmip/cmip.cnf
@@ -3,7 +3,7 @@
 
 # $Id$
 
-#.INCLUDE ../acse/acse-exp.cnf
+#.IMPORT ../acse/acse-exp.cnf
 
 #.MODULE
 Remote-Operations-Information-Objects cmip.ros
diff --git a/asn1/cms/cms.cnf b/asn1/cms/cms.cnf
index 8de70fb137..099db6a4c2 100644
--- a/asn1/cms/cms.cnf
+++ b/asn1/cms/cms.cnf
@@ -3,8 +3,8 @@
 
 # $Id$
 
-#.INCLUDE ../x509af/x509af-exp.cnf
-#.INCLUDE ../x509if/x509if-exp.cnf
+#.IMPORT ../x509af/x509af-exp.cnf
+#.IMPORT ../x509if/x509if-exp.cnf
 
 #.EXPORTS
 ContentInfo
diff --git a/asn1/dap/dap.cnf b/asn1/dap/dap.cnf
index f0280d3679..e9e08dd330 100644
--- a/asn1/dap/dap.cnf
+++ b/asn1/dap/dap.cnf
@@ -1,11 +1,11 @@
-#.INCLUDE	../x509if/x509if-exp.cnf
-#.INCLUDE	../x509af/x509af-exp.cnf
-#.INCLUDE	../x509sat/x509sat-exp.cnf
-#.INCLUDE	../pkixcrmf/crmf-exp.cnf
-#.INCLUDE	../dsp/dsp-exp.cnf
-#.INCLUDE	../disp/disp-exp.cnf
-#.INCLUDE	../ros/ros-exp.cnf
-#.INCLUDE	../acse/acse-exp.cnf
+#.IMPORT	../x509if/x509if-exp.cnf
+#.IMPORT	../x509af/x509af-exp.cnf
+#.IMPORT	../x509sat/x509sat-exp.cnf
+#.IMPORT	../pkixcrmf/crmf-exp.cnf
+#.IMPORT	../dsp/dsp-exp.cnf
+#.IMPORT	../disp/disp-exp.cnf
+#.IMPORT	../ros/ros-exp.cnf
+#.IMPORT	../acse/acse-exp.cnf
 
 #.MODULE_IMPORT
 ServiceAdministration	x509if
diff --git a/asn1/disp/disp.cnf b/asn1/disp/disp.cnf
index 1f72c221d9..ea0d807bf3 100644
--- a/asn1/disp/disp.cnf
+++ b/asn1/disp/disp.cnf
@@ -4,12 +4,12 @@ Time			TYPE = FT_STRING  DISPLAY = BASE_NONE  STRING = NULL BITMASK = 0
 #.MODULE_IMPORT
 OperationalBindingManagement	dop
 
-#.INCLUDE ../x509if/x509if-exp.cnf
-#.INCLUDE ../x509af/x509af-exp.cnf
-#.INCLUDE ../dap/dap-exp.cnf
-#.INCLUDE ../dsp/dsp-exp.cnf
-#.INCLUDE ../dop/dop-exp.cnf
-#.INCLUDE ../acse/acse-exp.cnf
+#.IMPORT ../x509if/x509if-exp.cnf
+#.IMPORT ../x509af/x509af-exp.cnf
+#.IMPORT ../dap/dap-exp.cnf
+#.IMPORT ../dsp/dsp-exp.cnf
+#.IMPORT ../dop/dop-exp.cnf
+#.IMPORT ../acse/acse-exp.cnf
 
 #.EXPORTS
 AgreementID
diff --git a/asn1/dop/dop.cnf b/asn1/dop/dop.cnf
index be115c3165..9a519aa542 100644
--- a/asn1/dop/dop.cnf
+++ b/asn1/dop/dop.cnf
@@ -1,10 +1,10 @@
-#.INCLUDE ../x509sat/x509sat-exp.cnf
-#.INCLUDE ../x509if/x509if-exp.cnf
-#.INCLUDE ../x509af/x509af-exp.cnf
-#.INCLUDE ../dsp/dsp-exp.cnf
-#.INCLUDE ../dap/dap-exp.cnf
-#.INCLUDE ../pkixcrmf/crmf-exp.cnf
-#.INCLUDE ../acse/acse-exp.cnf
+#.IMPORT ../x509sat/x509sat-exp.cnf
+#.IMPORT ../x509if/x509if-exp.cnf
+#.IMPORT ../x509af/x509af-exp.cnf
+#.IMPORT ../dsp/dsp-exp.cnf
+#.IMPORT ../dap/dap-exp.cnf
+#.IMPORT ../pkixcrmf/crmf-exp.cnf
+#.IMPORT ../acse/acse-exp.cnf
 
 #.MODULE_IMPORT
 BasicAccessControl		crmf
diff --git a/asn1/dsp/dsp.cnf b/asn1/dsp/dsp.cnf
index 45e339459a..41cefacae6 100644
--- a/asn1/dsp/dsp.cnf
+++ b/asn1/dsp/dsp.cnf
@@ -2,11 +2,11 @@
 DirectoryAccessProtocol		dap
 ServiceAdministration		x509if
 
-#.INCLUDE	../dap/dap-exp.cnf
-#.INCLUDE	../x509if/x509if-exp.cnf
-#.INCLUDE	../x509af/x509af-exp.cnf
-#.INCLUDE	../x509sat/x509sat-exp.cnf
-#.INCLUDE	../acse/acse-exp.cnf
+#.IMPORT	../dap/dap-exp.cnf
+#.IMPORT	../x509if/x509if-exp.cnf
+#.IMPORT	../x509af/x509af-exp.cnf
+#.IMPORT	../x509sat/x509sat-exp.cnf
+#.IMPORT	../acse/acse-exp.cnf
 
 #.EXPORTS
 OperationProgress
diff --git a/asn1/ess/ess.cnf b/asn1/ess/ess.cnf
index cea949b29e..23f2650566 100644
--- a/asn1/ess/ess.cnf
+++ b/asn1/ess/ess.cnf
@@ -3,9 +3,9 @@
 
 # $Id$
 
-#.INCLUDE ../x509af/x509af-exp.cnf
-#.INCLUDE ../x509ce/x509ce-exp.cnf
-#.INCLUDE ../cms/cms-exp.cnf
+#.IMPORT ../x509af/x509af-exp.cnf
+#.IMPORT ../x509ce/x509ce-exp.cnf
+#.IMPORT ../cms/cms-exp.cnf
 
 #.EXPORTS
 
diff --git a/asn1/ftam/ftam.cnf b/asn1/ftam/ftam.cnf
index f065d72694..cb8c76134e 100644
--- a/asn1/ftam/ftam.cnf
+++ b/asn1/ftam/ftam.cnf
@@ -3,7 +3,7 @@
 
 # $Id$
 
-#.INCLUDE ../acse/acse-exp.cnf
+#.IMPORT ../acse/acse-exp.cnf
 
 #.EXPORTS
 Attribute-Extensions
diff --git a/asn1/gnm/gnm.cnf b/asn1/gnm/gnm.cnf
index e642536086..2ced84f4c6 100644
--- a/asn1/gnm/gnm.cnf
+++ b/asn1/gnm/gnm.cnf
@@ -2,7 +2,7 @@
 # gnm conformation file
 # $Id$
 
-#.INCLUDE ../cmip/cmip-exp.cnf
+#.IMPORT ../cmip/cmip-exp.cnf
 #.EXPORTS
 
 #.PDU
diff --git a/asn1/gsmmap/Makefile.common b/asn1/gsmmap/Makefile.common
index 516307c672..a122ede9a0 100644
--- a/asn1/gsmmap/Makefile.common
+++ b/asn1/gsmmap/Makefile.common
@@ -22,8 +22,8 @@
 
 PROTOCOL_NAME=gsmmap
 
-DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \
-	packet-$(PROTOCOL_NAME).h
+DISSECTOR_FILES=packet-gsm_map.c \
+	packet-gsm_map.h
 
 NEED_PACKET_PROTO_H = 1
 
diff --git a/asn1/gsmmap/gsmmap.cnf b/asn1/gsmmap/gsmmap.cnf
index 1e5cabf5d5..08d54ef036 100644
--- a/asn1/gsmmap/gsmmap.cnf
+++ b/asn1/gsmmap/gsmmap.cnf
@@ -5,7 +5,7 @@
 -X
 #-d satcom
 -d om
--s packet-gsm_map-tmp
+#-s packet-gsm_map-tmp
 -k
 -o gsm_map
 #.END
diff --git a/asn1/h225/Makefile.common b/asn1/h225/Makefile.common
index a0e5e03dce..f1bf14a595 100644
--- a/asn1/h225/Makefile.common
+++ b/asn1/h225/Makefile.common
@@ -49,9 +49,7 @@ SRC_FILES = \
 
 A2W_FLAGS= -e
 
-EXTRA_CNF = 
-
-IMPORT_CNF = \
+EXTRA_CNF = \
 	../h235/h235-exp.cnf \
 	../h245/h245-exp.cnf
 
diff --git a/asn1/h235/Makefile.common b/asn1/h235/Makefile.common
index f9a8961ed7..fe9adec5fc 100644
--- a/asn1/h235/Makefile.common
+++ b/asn1/h235/Makefile.common
@@ -49,9 +49,7 @@ SRC_FILES = \
 
 A2W_FLAGS = -e
 
-EXTRA_CNF = 
-
-IMPORT_CNF = \
+EXTRA_CNF = \
 	../h225/h225-exp.cnf
 
 ../h225/h225-exp.cnf:
diff --git a/asn1/h450/h450.cnf b/asn1/h450/h450.cnf
index 9761f16b1f..b89dafa008 100644
--- a/asn1/h450/h450.cnf
+++ b/asn1/h450/h450.cnf
@@ -10,8 +10,8 @@ GROUP_BY_PROT
 -o h450
 #.END
 
-#.INCLUDE ../h225/h225-exp.cnf
-#.INCLUDE ../h450-ros/h450-ros-exp.cnf 
+#.IMPORT ../h225/h225-exp.cnf
+#.IMPORT ../h450-ros/h450-ros-exp.cnf 
 
 #.MODULE
 
diff --git a/asn1/logotype-cert-extn/logotypecertextn.cnf b/asn1/logotype-cert-extn/logotypecertextn.cnf
index 4f579a0ac2..a699cbcebb 100644
--- a/asn1/logotype-cert-extn/logotypecertextn.cnf
+++ b/asn1/logotype-cert-extn/logotypecertextn.cnf
@@ -3,7 +3,7 @@
 
 # $Id$
 
-#.INCLUDE ../x509af/x509af-exp.cnf
+#.IMPORT ../x509af/x509af-exp.cnf
 
 #.EXPORTS
 
diff --git a/asn1/mms/mms.cnf b/asn1/mms/mms.cnf
index 585b6907e6..308f9f3f17 100644
--- a/asn1/mms/mms.cnf
+++ b/asn1/mms/mms.cnf
@@ -6,7 +6,7 @@
 #.MODULE_IMPORT
 ISO-8650-ACSE-1 acse
 
-#.INCLUDE ../acse/acse-exp.cnf
+#.IMPORT ../acse/acse-exp.cnf
 
 #.EXPORTS
 MMSpdu
diff --git a/asn1/ocsp/ocsp.cnf b/asn1/ocsp/ocsp.cnf
index d34f2002ce..b0785ed6a1 100644
--- a/asn1/ocsp/ocsp.cnf
+++ b/asn1/ocsp/ocsp.cnf
@@ -7,8 +7,8 @@
 PKIX1Implicit88 pkix1implicit
 PKIX1Explicit88 pkix1explicit
 
-#.INCLUDE ../x509af/x509af-exp.cnf
-#.INCLUDE ../x509ce/x509ce-exp.cnf
+#.IMPORT ../x509af/x509af-exp.cnf
+#.IMPORT ../x509ce/x509ce-exp.cnf
 #.INCLUDE ../pkix1implicit/pkix1implicit_exp.cnf
 #.INCLUDE ../pkix1explicit/pkix1explicit_exp.cnf
 
diff --git a/asn1/pkcs1/pkcs1.cnf b/asn1/pkcs1/pkcs1.cnf
index 53b8b16354..e50bddc6fd 100644
--- a/asn1/pkcs1/pkcs1.cnf
+++ b/asn1/pkcs1/pkcs1.cnf
@@ -3,7 +3,7 @@
 
 # $Id$
 
-#.INCLUDE ../x509af/x509af-exp.cnf
+#.IMPORT ../x509af/x509af-exp.cnf
 
 #.EXPORTS
 
diff --git a/asn1/pkcs12/pkcs12.cnf b/asn1/pkcs12/pkcs12.cnf
index 39e95352ed..843fdaf6e3 100644
--- a/asn1/pkcs12/pkcs12.cnf
+++ b/asn1/pkcs12/pkcs12.cnf
@@ -7,9 +7,9 @@
 PKCS-7	cms
 PKCS-5	x509af
 
-#.INCLUDE ../cms/cms-exp.cnf
-#.INCLUDE ../x509if/x509if-exp.cnf
-#.INCLUDE ../x509af/x509af-exp.cnf
+#.IMPORT ../cms/cms-exp.cnf
+#.IMPORT ../x509if/x509if-exp.cnf
+#.IMPORT ../x509af/x509af-exp.cnf
 
 #.EXPORTS
 
diff --git a/asn1/pkinit/pkinit.cnf b/asn1/pkinit/pkinit.cnf
index dd7aa3b5fe..3174efef02 100644
--- a/asn1/pkinit/pkinit.cnf
+++ b/asn1/pkinit/pkinit.cnf
@@ -7,7 +7,7 @@
 PKIX1Explicit88              pkix1explicit
 
 #.INCLUDE ../pkix1explicit/pkix1explicit_exp.cnf
-#.INCLUDE ../cms/cms-exp.cnf
+#.IMPORT ../cms/cms-exp.cnf
 
 #.EXPORTS
 
diff --git a/asn1/pkix1implicit/pkix1implicit.cnf b/asn1/pkix1implicit/pkix1implicit.cnf
index 3bfc3d33ad..86146edbbf 100644
--- a/asn1/pkix1implicit/pkix1implicit.cnf
+++ b/asn1/pkix1implicit/pkix1implicit.cnf
@@ -7,7 +7,7 @@
 PKIX1Explicit93 pkix1explicit
 
 #.INCLUDE ../pkix1explicit/pkix1explicit_exp.cnf
-#.INCLUDE ../x509ce/x509ce-exp.cnf
+#.IMPORT ../x509ce/x509ce-exp.cnf
 
 #.EXPORTS
 
diff --git a/asn1/pkixcmp/cmp.cnf b/asn1/pkixcmp/cmp.cnf
index a57343259c..5a1f1cc6c5 100644
--- a/asn1/pkixcmp/cmp.cnf
+++ b/asn1/pkixcmp/cmp.cnf
@@ -10,7 +10,7 @@ PKIXCRMF-2005	crmf
 		
 #.INCLUDE ../pkix1explicit/pkix1explicit_exp.cnf
 #.INCLUDE ../pkix1implicit/pkix1implicit_exp.cnf
-#.INCLUDE ../pkixcrmf/crmf-exp.cnf
+#.IMPORT ../pkixcrmf/crmf-exp.cnf
 
 #.EXPORTS
 CAKeyUpdAnnContent
diff --git a/asn1/pkixcrmf/crmf.cnf b/asn1/pkixcrmf/crmf.cnf
index 55567b4b72..3b28ba8b94 100644
--- a/asn1/pkixcrmf/crmf.cnf
+++ b/asn1/pkixcrmf/crmf.cnf
@@ -8,7 +8,7 @@ PKIX1Explicit88	pkix1explicit
 PKIX1Implicit88	pkix1implicit
 CryptographicMessageSyntax2004 cms
 		
-#.INCLUDE ../cms/cms-exp.cnf
+#.IMPORT ../cms/cms-exp.cnf
 #.INCLUDE ../pkix1explicit/pkix1explicit_exp.cnf
 #.INCLUDE ../pkix1implicit/pkix1implicit_exp.cnf
 
diff --git a/asn1/pkixqualified/pkixqualified.cnf b/asn1/pkixqualified/pkixqualified.cnf
index 1e19ce4cd3..4d435b54d9 100644
--- a/asn1/pkixqualified/pkixqualified.cnf
+++ b/asn1/pkixqualified/pkixqualified.cnf
@@ -3,9 +3,9 @@
 
 # $Id$
 
-#.INCLUDE ../x509ce/x509ce-exp.cnf
-#.INCLUDE ../x509af/x509af-exp.cnf
-#.INCLUDE ../x509sat/x509sat-exp.cnf
+#.IMPORT ../x509ce/x509ce-exp.cnf
+#.IMPORT ../x509af/x509af-exp.cnf
+#.IMPORT ../x509sat/x509sat-exp.cnf
 
 #.EXPORTS
 
diff --git a/asn1/pkixtsp/pkixtsp.cnf b/asn1/pkixtsp/pkixtsp.cnf
index 27fe469d1b..053d54e569 100644
--- a/asn1/pkixtsp/pkixtsp.cnf
+++ b/asn1/pkixtsp/pkixtsp.cnf
@@ -9,7 +9,7 @@ PKIX1Implicit88 pkix1implicit
 
 #.INCLUDE ../pkix1explicit/pkix1explicit_exp.cnf
 #.INCLUDE ../pkix1implicit/pkix1implicit_exp.cnf
-#.INCLUDE ../cms/cms-exp.cnf
+#.IMPORT ../cms/cms-exp.cnf
 
 #.EXPORTS
 
diff --git a/asn1/pres/pres.cnf b/asn1/pres/pres.cnf
index 2ad84caaeb..5f7834d4cf 100644
--- a/asn1/pres/pres.cnf
+++ b/asn1/pres/pres.cnf
@@ -3,7 +3,7 @@
 
 # $Id$
 
-#.INCLUDE ../rtse/rtse-exp.cnf
+#.IMPORT ../rtse/rtse-exp.cnf
 
 #.EXPORTS
 
diff --git a/asn1/q932/Makefile.common b/asn1/q932/Makefile.common
index a421ee741a..e0d7fa495e 100644
--- a/asn1/q932/Makefile.common
+++ b/asn1/q932/Makefile.common
@@ -54,4 +54,3 @@ A2W_FLAGS= -e -b -T -X
 
 EXTRA_CNF =
 
-IMPORT_CNF =
diff --git a/asn1/qsig/Makefile.common b/asn1/qsig/Makefile.common
index 30ed17def4..15c2ddc37b 100644
--- a/asn1/qsig/Makefile.common
+++ b/asn1/qsig/Makefile.common
@@ -79,4 +79,3 @@ A2W_FLAGS = -e
 
 EXTRA_CNF = 
 
-IMPORT_CNF = 
diff --git a/asn1/s4406/s4406.cnf b/asn1/s4406/s4406.cnf
index 92c09c1f9e..46fdc27441 100644
--- a/asn1/s4406/s4406.cnf
+++ b/asn1/s4406/s4406.cnf
@@ -1,8 +1,8 @@
 #.MODULE_IMPORT 
 MTSAbstractService	x411
 
-#.INCLUDE ../x411/x411-exp.cnf
-#.INCLUDE ../x420/x420-exp.cnf
+#.IMPORT ../x411/x411-exp.cnf
+#.IMPORT ../x420/x420-exp.cnf
 
 #.TYPE_RENAME
 AddressListDesignator/type	AddressListType
diff --git a/asn1/x411/x411.cnf b/asn1/x411/x411.cnf
index 04ae824d60..6daeafa570 100644
--- a/asn1/x411/x411.cnf
+++ b/asn1/x411/x411.cnf
@@ -2,11 +2,11 @@
 CountryName 	TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x411_CountryName_vals)  BITMASK = 0
 Time			TYPE = FT_STRING  DISPLAY = BASE_NONE  STRING = NULL BITMASK = 0
 
-#.INCLUDE ../acse/acse-exp.cnf
-#.INCLUDE ../x509ce/x509ce-exp.cnf
-#.INCLUDE ../x509if/x509if-exp.cnf
-#.INCLUDE ../x509sat/x509sat-exp.cnf
-#.INCLUDE ../x509af/x509af-exp.cnf
+#.IMPORT ../acse/acse-exp.cnf
+#.IMPORT ../x509ce/x509ce-exp.cnf
+#.IMPORT ../x509if/x509if-exp.cnf
+#.IMPORT ../x509sat/x509sat-exp.cnf
+#.IMPORT ../x509af/x509af-exp.cnf
 
 #.EXPORTS
 ContentLength
diff --git a/asn1/x420/x420.cnf b/asn1/x420/x420.cnf
index 99afc2943d..ddbf30e569 100644
--- a/asn1/x420/x420.cnf
+++ b/asn1/x420/x420.cnf
@@ -4,11 +4,11 @@ Time			TYPE = FT_STRING  DISPLAY = BASE_NONE  STRING = NULL BITMASK = 0
 #.MODULE_IMPORT
 MTSAbstractService	x411
 
-#.INCLUDE ../ftam/ftam-exp.cnf
-#.INCLUDE ../x411/x411-exp.cnf
-#.INCLUDE ../x509af/x509af-exp.cnf
-#.INCLUDE ../x509ce/x509ce-exp.cnf
-#.INCLUDE ../acse/acse-exp.cnf
+#.IMPORT ../ftam/ftam-exp.cnf
+#.IMPORT ../x411/x411-exp.cnf
+#.IMPORT ../x509af/x509af-exp.cnf
+#.IMPORT ../x509ce/x509ce-exp.cnf
+#.IMPORT ../acse/acse-exp.cnf
 
 
 #.MODULE
diff --git a/asn1/x509af/x509af.cnf b/asn1/x509af/x509af.cnf
index c52ac2654e..c0fb38b08f 100644
--- a/asn1/x509af/x509af.cnf
+++ b/asn1/x509af/x509af.cnf
@@ -3,9 +3,9 @@
 
 # $Id$
 
-#.INCLUDE ../x509ce/x509ce-exp.cnf
-#.INCLUDE ../x509if/x509if-exp.cnf
-#.INCLUDE ../x509sat/x509sat-exp.cnf
+#.IMPORT ../x509ce/x509ce-exp.cnf
+#.IMPORT ../x509if/x509if-exp.cnf
+#.IMPORT ../x509sat/x509sat-exp.cnf
 
 #.EXPORTS
 ACPathData
diff --git a/asn1/x509ce/x509ce.cnf b/asn1/x509ce/x509ce.cnf
index 9d4b6039c1..cf7e8004a9 100644
--- a/asn1/x509ce/x509ce.cnf
+++ b/asn1/x509ce/x509ce.cnf
@@ -6,10 +6,10 @@
 #.MODULE_IMPORT
 MTSAbstractService	x411
 
-#.INCLUDE ../x509if/x509if-exp.cnf
-#.INCLUDE ../x509af/x509af-exp.cnf
-#.INCLUDE ../x509sat/x509sat-exp.cnf
-#.INCLUDE ../x411/x411-exp.cnf
+#.IMPORT ../x509if/x509if-exp.cnf
+#.IMPORT ../x509af/x509af-exp.cnf
+#.IMPORT ../x509sat/x509sat-exp.cnf
+#.IMPORT ../x411/x411-exp.cnf
 
 #.EXPORTS
 AltNameType
diff --git a/asn1/x509if/x509if.cnf b/asn1/x509if/x509if.cnf
index e2acbb9f5b..fe75422f31 100644
--- a/asn1/x509if/x509if.cnf
+++ b/asn1/x509if/x509if.cnf
@@ -3,7 +3,7 @@
 
 # $Id$
 
-#.INCLUDE ../x509sat/x509sat-exp.cnf
+#.IMPORT ../x509sat/x509sat-exp.cnf
 
 #.EXPORTS
 AllowedSubset
diff --git a/asn1/x509sat/x509sat.cnf b/asn1/x509sat/x509sat.cnf
index 21d312c043..a7ea02b5cc 100644
--- a/asn1/x509sat/x509sat.cnf
+++ b/asn1/x509sat/x509sat.cnf
@@ -3,7 +3,7 @@
 
 # $Id$
 
-#.INCLUDE ../x509if/x509if-exp.cnf
+#.IMPORT ../x509if/x509if-exp.cnf
 
 #.EXPORTS
 CaseIgnoreListMatch
author	Jörg Mayer <jmayer@loplof.de>	2007-10-16 13:59:40 +0000
committer	Jörg Mayer <jmayer@loplof.de>	2007-10-16 13:59:40 +0000
commit	c2d0c8fa3161a00dfa3942d55cb60de677ba9c9b (patch)
tree	1bc554069aa8a26b7fc84961ac447b8fe7d120b4
parent	254a5ad7059c6eb3eba980abc624a4b62487ada2 (diff)