more makefiles changed to new export mechanism

svn path=/trunk/; revision=23132

18 files changed, 32 insertions, 11 deletions

diff --git a/asn1/h235/Makefile.am b/asn1/h235/Makefile.am
index a034690647..462af31e88 100644
--- a/asn1/h235/Makefile.am
+++ b/asn1/h235/Makefile.am
@@ -20,6 +20,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
+include ../Makefile.preinc
 include Makefile.common
 include ../Makefile.inc
 
diff --git a/asn1/h235/Makefile.common b/asn1/h235/Makefile.common
index 7408c2b013..5a3e8cbc5b 100644
--- a/asn1/h235/Makefile.common
+++ b/asn1/h235/Makefile.common
@@ -27,6 +27,8 @@ DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \
 
 NEED_PACKET_PROTO_H = 1
 
+EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf
+
 EXT_ASN_FILE_LIST =
 
 ASN_FILE_LIST = \
@@ -45,7 +47,7 @@ SRC_FILES = \
 	$(EXTRA_DIST) \
 	$(EXT_ASN_FILE_LIST)
 
-A2W_FLAGS= 
+A2W_FLAGS = -e
 
 EXTRA_CNF=
 
diff --git a/asn1/h235/Makefile.nmake b/asn1/h235/Makefile.nmake
index b3fa922696..5a32997c60 100644
--- a/asn1/h235/Makefile.nmake
+++ b/asn1/h235/Makefile.nmake
@@ -22,7 +22,8 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
-include Makefile.common
 include ../../config.nmake
+include ../Makefile.preinc.nmake
+include Makefile.common
 include ../Makefile.inc.nmake
 
diff --git a/asn1/h450-ros/Makefile.am b/asn1/h450-ros/Makefile.am
index a034690647..462af31e88 100644
--- a/asn1/h450-ros/Makefile.am
+++ b/asn1/h450-ros/Makefile.am
@@ -20,6 +20,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
+include ../Makefile.preinc
 include Makefile.common
 include ../Makefile.inc
 
diff --git a/asn1/h450-ros/Makefile.common b/asn1/h450-ros/Makefile.common
index 3e731d9898..caae4fdbf5 100644
--- a/asn1/h450-ros/Makefile.common
+++ b/asn1/h450-ros/Makefile.common
@@ -31,6 +31,8 @@ DISSECTOR_FILES = \
 
 NEED_PACKET_PROTO_H = 1
 
+EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf
+
 EXT_ASN_FILE_LIST = ../ros/Remote-Operations-Information-Objects.asn
 
 ASN_FILE_LIST = Remote-Operations-Apdus.asn
diff --git a/asn1/h450-ros/Makefile.nmake b/asn1/h450-ros/Makefile.nmake
index b3fa922696..5a32997c60 100644
--- a/asn1/h450-ros/Makefile.nmake
+++ b/asn1/h450-ros/Makefile.nmake
@@ -22,7 +22,8 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
-include Makefile.common
 include ../../config.nmake
+include ../Makefile.preinc.nmake
+include Makefile.common
 include ../Makefile.inc.nmake
 
diff --git a/asn1/h450/Makefile.am b/asn1/h450/Makefile.am
index a034690647..462af31e88 100644
--- a/asn1/h450/Makefile.am
+++ b/asn1/h450/Makefile.am
@@ -20,6 +20,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
+include ../Makefile.preinc
 include Makefile.common
 include ../Makefile.inc
 
diff --git a/asn1/h450/Makefile.common b/asn1/h450/Makefile.common
index ee7fd81d5c..2bacd380cf 100644
--- a/asn1/h450/Makefile.common
+++ b/asn1/h450/Makefile.common
@@ -66,12 +66,13 @@ SRC_FILES = \
 
 A2W_FLAGS= 
 
-EXTRA_CNF=../h225/h225-exp.cnf \
+EXTRA_CNF = \
+	../h225/h225-exp.cnf	\
 	../h450-ros/h450-ros-exp.cnf
 
 ../h225/h225-exp.cnf:
-	(cd ../h225 && $(MAKE) $(MAKEFLAGS))
+	(cd ../h225 && $(MAKE_CNF_EXPORT))
 
 ../h450-ros/h450-ros-exp.cnf:
-	(cd ../h450-ros && $(MAKE) $(MAKEFLAGS))
+	(cd ../h450-ros && $(MAKE_CNF_EXPORT))
 
diff --git a/asn1/h450/Makefile.nmake b/asn1/h450/Makefile.nmake
index b3fa922696..5a32997c60 100644
--- a/asn1/h450/Makefile.nmake
+++ b/asn1/h450/Makefile.nmake
@@ -22,7 +22,8 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
-include Makefile.common
 include ../../config.nmake
+include ../Makefile.preinc.nmake
+include Makefile.common
 include ../Makefile.inc.nmake
 
diff --git a/asn1/q932-ros/Makefile.am b/asn1/q932-ros/Makefile.am
index a034690647..462af31e88 100644
--- a/asn1/q932-ros/Makefile.am
+++ b/asn1/q932-ros/Makefile.am
@@ -20,6 +20,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
+include ../Makefile.preinc
 include Makefile.common
 include ../Makefile.inc
 
diff --git a/asn1/q932-ros/Makefile.common b/asn1/q932-ros/Makefile.common
index ec7b741b35..79e4ad5f2e 100644
--- a/asn1/q932-ros/Makefile.common
+++ b/asn1/q932-ros/Makefile.common
@@ -44,7 +44,7 @@ SRC_FILES = \
 	$(EXTRA_DIST) \
 	$(EXT_ASN_FILE_LIST)
 
-A2W_FLAGS= -b -T -X -e
+A2W_FLAGS= -b -T -X
 
 EXTRA_CNF = \
 	../ros/ros-inv.cnf \
diff --git a/asn1/q932-ros/Makefile.nmake b/asn1/q932-ros/Makefile.nmake
index b3fa922696..5a32997c60 100644
--- a/asn1/q932-ros/Makefile.nmake
+++ b/asn1/q932-ros/Makefile.nmake
@@ -22,7 +22,8 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
-include Makefile.common
 include ../../config.nmake
+include ../Makefile.preinc.nmake
+include Makefile.common
 include ../Makefile.inc.nmake
 
diff --git a/asn1/q932/Makefile.am b/asn1/q932/Makefile.am
index a034690647..462af31e88 100644
--- a/asn1/q932/Makefile.am
+++ b/asn1/q932/Makefile.am
@@ -20,6 +20,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
+include ../Makefile.preinc
 include Makefile.common
 include ../Makefile.inc
 
diff --git a/asn1/q932/Makefile.common b/asn1/q932/Makefile.common
index 5a4500cd3c..9d87c3b52f 100644
--- a/asn1/q932/Makefile.common
+++ b/asn1/q932/Makefile.common
@@ -27,6 +27,8 @@ DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \
 
 NEED_PACKET_PROTO_H = 1
 
+EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf
+
 EXT_ASN_FILE_LIST =
 
 ASN_FILE_LIST = \
diff --git a/asn1/q932/Makefile.nmake b/asn1/q932/Makefile.nmake
index b3fa922696..5a32997c60 100644
--- a/asn1/q932/Makefile.nmake
+++ b/asn1/q932/Makefile.nmake
@@ -22,7 +22,8 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
-include Makefile.common
 include ../../config.nmake
+include ../Makefile.preinc.nmake
+include Makefile.common
 include ../Makefile.inc.nmake
 
diff --git a/asn1/qsig/Makefile.am b/asn1/qsig/Makefile.am
index a034690647..462af31e88 100644
--- a/asn1/qsig/Makefile.am
+++ b/asn1/qsig/Makefile.am
@@ -20,6 +20,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
+include ../Makefile.preinc
 include Makefile.common
 include ../Makefile.inc
 
diff --git a/asn1/qsig/Makefile.common b/asn1/qsig/Makefile.common
index 7a467f50f2..15c2ddc37b 100644
--- a/asn1/qsig/Makefile.common
+++ b/asn1/qsig/Makefile.common
@@ -28,6 +28,8 @@ DISSECTOR_FILES = \
 
 NEED_PACKET_PROTO_H = 1
 
+EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf
+
 EXT_ASN_FILE_LIST = 
 
 ASN_FILE_LIST = \
diff --git a/asn1/qsig/Makefile.nmake b/asn1/qsig/Makefile.nmake
index b3fa922696..5a32997c60 100644
--- a/asn1/qsig/Makefile.nmake
+++ b/asn1/qsig/Makefile.nmake
@@ -22,7 +22,8 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
-include Makefile.common
 include ../../config.nmake
+include ../Makefile.preinc.nmake
+include Makefile.common
 include ../Makefile.inc.nmake