diff options
| -rw-r--r-- | asn1/Makefile.preinc | 24 | ||||
| -rw-r--r-- | asn1/Makefile.preinc.nmake | 26 | ||||
| -rw-r--r-- | asn1/h225/Makefile.am | 3 | ||||
| -rw-r--r-- | asn1/h225/Makefile.nmake | 4 | ||||
| -rw-r--r-- | asn1/h245/Makefile.am | 1 | ||||
| -rw-r--r-- | asn1/h245/Makefile.nmake | 3 |
6 files changed, 56 insertions, 5 deletions
diff --git a/asn1/Makefile.preinc b/asn1/Makefile.preinc new file mode 100644 index 0000000000..cfab7961cf --- /dev/null +++ b/asn1/Makefile.preinc @@ -0,0 +1,24 @@ +# To be included into the asn1 Makefiles +# +# $Id$ +# +# +# Wireshark - Network traffic analyzer +# By Gerald Combs <gerald@wireshark.org> +# Copyright 1998 Gerald Combs +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# 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) generate_export diff --git a/asn1/Makefile.preinc.nmake b/asn1/Makefile.preinc.nmake new file mode 100644 index 0000000000..15731a1284 --- /dev/null +++ b/asn1/Makefile.preinc.nmake @@ -0,0 +1,26 @@ +# To be included into the asn1 Makefiles for Windows builds +# +# $Id$ +# +# +# Wireshark - Network traffic analyzer +# By Gerald Combs <gerald@wireshark.org> +# Copyright 1998 Gerald Combs +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# 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 generate_export + diff --git a/asn1/h225/Makefile.am b/asn1/h225/Makefile.am index 333aba51e0..462af31e88 100644 --- a/asn1/h225/Makefile.am +++ b/asn1/h225/Makefile.am @@ -20,8 +20,7 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -MAKE_CNF_EXPORT = $(MAKE) $(MAKEFLAGS) generate_export - +include ../Makefile.preinc include Makefile.common include ../Makefile.inc diff --git a/asn1/h225/Makefile.nmake b/asn1/h225/Makefile.nmake index 99506b295c..5a32997c60 100644 --- a/asn1/h225/Makefile.nmake +++ b/asn1/h225/Makefile.nmake @@ -21,9 +21,9 @@ # 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 generate_export -include Makefile.common include ../../config.nmake +include ../Makefile.preinc.nmake +include Makefile.common include ../Makefile.inc.nmake diff --git a/asn1/h245/Makefile.am b/asn1/h245/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/h245/Makefile.am +++ b/asn1/h245/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/h245/Makefile.nmake b/asn1/h245/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/h245/Makefile.nmake +++ b/asn1/h245/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 |