diff options
| author | Tomas Kukosa <tomas.kukosa@siemens.com> | 2007-10-10 10:56:17 +0000 |
|---|---|---|
| committer | Tomas Kukosa <tomas.kukosa@siemens.com> | 2007-10-10 10:56:17 +0000 |
| commit | e8c04c81dacdf380e5751f7ad1f6906cd5bf5758 (patch) | |
| tree | c371c9e2e1f3035cf6db25ad1b25ec93c7764acd /asn1/h450 | |
| parent | 6115b7601d823ca4e7e5d14ca400c8fbb8ceeaf5 (diff) | |
| download | wireshark-e8c04c81dacdf380e5751f7ad1f6906cd5bf5758.tar.gz | |
more makefiles changed to new export mechanism
svn path=/trunk/; revision=23132
Diffstat (limited to 'asn1/h450')
| -rw-r--r-- | asn1/h450/Makefile.am | 1 | ||||
| -rw-r--r-- | asn1/h450/Makefile.common | 7 | ||||
| -rw-r--r-- | asn1/h450/Makefile.nmake | 3 |
3 files changed, 7 insertions, 4 deletions
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 |