diff options
author | Tomas Kukosa <tomas.kukosa@siemens.com> | 2007-10-10 08:14:36 +0000 |
---|---|---|
committer | Tomas Kukosa <tomas.kukosa@siemens.com> | 2007-10-10 08:14:36 +0000 |
commit | 20078dd04a767be48ce6cadb748c2c6c5011e4cd (patch) | |
tree | 633fa4fed3a5271eccfcaf8388c01959f1cb640a | |
parent | 24470fdfae786209924c14eeaa4956fea13ce63c (diff) |
solution for different submake calling on Windows and Linux
only one dissector is committed to test it
svn path=/trunk/; revision=23128
-rw-r--r-- | asn1/h225/Makefile.am | 2 | ||||
-rw-r--r-- | asn1/h225/Makefile.common | 4 | ||||
-rw-r--r-- | asn1/h225/Makefile.nmake | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/asn1/h225/Makefile.am b/asn1/h225/Makefile.am index a034690647..7ea454dd8e 100644 --- a/asn1/h225/Makefile.am +++ b/asn1/h225/Makefile.am @@ -20,6 +20,8 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +MAKE_CNF_EXPORT = $(MAKE) $(MAKEFLAGS) + include Makefile.common include ../Makefile.inc diff --git a/asn1/h225/Makefile.common b/asn1/h225/Makefile.common index 0d830afcb8..12a1072ef3 100644 --- a/asn1/h225/Makefile.common +++ b/asn1/h225/Makefile.common @@ -50,8 +50,8 @@ EXTRA_CNF= \ ../h245/h245-exp.cnf ../h235/h235-exp.cnf: - (cd ../h235 && $(MAKE) $(MAKEFLAGS)) + (cd ../h235 && $(MAKE_CNF_EXPORT)) ../h245/h245-exp.cnf: - (cd ../h245 && $(MAKE) $(MAKEFLAGS)) + (cd ../h245 && $(MAKE_CNF_EXPORT)) diff --git a/asn1/h225/Makefile.nmake b/asn1/h225/Makefile.nmake index b3fa922696..b774b99a43 100644 --- a/asn1/h225/Makefile.nmake +++ b/asn1/h225/Makefile.nmake @@ -21,6 +21,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +MAKE_CNF_EXPORT = $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake include Makefile.common include ../../config.nmake |