diff options
| author | kukosa <kukosa@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-10-10 08:14:36 +0000 |
|---|---|---|
| committer | kukosa <kukosa@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-10-10 08:14:36 +0000 |
| commit | 76afea4e4b4b760d58f4407f359118dddb27b179 (patch) | |
| tree | 633fa4fed3a5271eccfcaf8388c01959f1cb640a /asn1/h225 | |
| parent | ea3421ad4803560925778c1a813ada90f072ca71 (diff) | |
solution for different submake calling on Windows and Linux
only one dissector is committed to test it
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23128 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'asn1/h225')
| -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 |