From 61cde0d09e0086b17aa8b7aa0b080b5ac7d78355 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Mayer?= Date: Wed, 10 Oct 2007 19:03:24 +0000 Subject: - Change Makefiles to include preinc - Add missing new directories to asn1/Makefile.nmake svn path=/trunk/; revision=23141 --- asn1/Makefile.nmake | 35 +++++++++++++------ asn1/acp133/Makefile.am | 1 + asn1/acp133/Makefile.nmake | 3 +- asn1/acse/Makefile.am | 1 + asn1/acse/Makefile.nmake | 3 +- asn1/ansi-tcap/Makefile.am | 1 + asn1/ansi-tcap/Makefile.nmake | 3 +- asn1/ansi_map/Makefile.am | 1 + asn1/ansi_map/Makefile.nmake | 3 +- asn1/camel/Makefile.am | 1 + asn1/camel/Makefile.nmake | 3 +- asn1/cdt/Makefile.am | 1 + asn1/cdt/Makefile.nmake | 3 +- asn1/cmip/Makefile.am | 1 + asn1/cmip/Makefile.nmake | 3 +- asn1/cms/Makefile.am | 1 + asn1/cms/Makefile.nmake | 3 +- asn1/dap/Makefile.am | 1 + asn1/dap/Makefile.nmake | 3 +- asn1/disp/Makefile.am | 1 + asn1/disp/Makefile.nmake | 3 +- asn1/dop/Makefile.am | 1 + asn1/dop/Makefile.nmake | 3 +- asn1/dsp/Makefile.am | 1 + asn1/dsp/Makefile.nmake | 3 +- asn1/ess/Makefile.am | 1 + asn1/ess/Makefile.nmake | 3 +- asn1/ftam/Makefile.am | 1 + asn1/ftam/Makefile.nmake | 3 +- asn1/gnm/Makefile.am | 1 + asn1/gnm/Makefile.nmake | 3 +- asn1/gsmmap/Makefile.am | 1 + asn1/gsmmap/Makefile.nmake | 3 +- asn1/h248/Makefile.am | 1 + asn1/h248/Makefile.nmake | 3 +- asn1/h450/Makefile.nmake | 2 +- asn1/inap/Makefile.am | 1 + asn1/inap/Makefile.nmake | 3 +- asn1/ldap/Makefile.am | 1 + asn1/ldap/Makefile.nmake | 3 +- asn1/logotype-cert-extn/Makefile.am | 1 + asn1/logotype-cert-extn/Makefile.nmake | 3 +- asn1/mms/Makefile.am | 1 + asn1/mms/Makefile.nmake | 3 +- asn1/mpeg-audio/Makefile.am | 1 + asn1/mpeg-audio/Makefile.nmake | 3 +- asn1/mpeg-pes/Makefile.am | 1 + asn1/mpeg-pes/Makefile.nmake | 3 +- asn1/nbap/Makefile.am | 1 + asn1/nbap/Makefile.nmake | 3 +- asn1/ns-cert-exts/Makefile.am | 1 + asn1/ns-cert-exts/Makefile.nmake | 3 +- asn1/ocsp/Makefile.am | 1 + asn1/ocsp/Makefile.nmake | 3 +- asn1/pkcs1/Makefile.am | 1 + asn1/pkcs1/Makefile.nmake | 3 +- asn1/pkcs12/Makefile.am | 1 + asn1/pkcs12/Makefile.nmake | 3 +- asn1/pkinit/Makefile.am | 1 + asn1/pkinit/Makefile.nmake | 3 +- asn1/pkix1explicit/Makefile.am | 1 + asn1/pkix1explicit/Makefile.nmake | 62 +++++++++++++-------------------- asn1/pkix1implicit/Makefile.am | 1 + asn1/pkix1implicit/Makefile.nmake | 3 +- asn1/pkixcmp/Makefile.am | 1 + asn1/pkixcmp/Makefile.nmake | 63 +++++++++++++--------------------- asn1/pkixcrmf/Makefile.am | 1 + asn1/pkixcrmf/Makefile.nmake | 3 +- asn1/pkixproxy/Makefile.am | 1 + asn1/pkixproxy/Makefile.nmake | 3 +- asn1/pkixqualified/Makefile.am | 1 + asn1/pkixqualified/Makefile.nmake | 3 +- asn1/pkixtsp/Makefile.am | 1 + asn1/pkixtsp/Makefile.nmake | 3 +- asn1/pres/Makefile.am | 1 + asn1/pres/Makefile.nmake | 3 +- asn1/ranap/Makefile.am | 1 + asn1/ranap/Makefile.nmake | 3 +- asn1/rnsap/Makefile.am | 1 + asn1/rnsap/Makefile.nmake | 3 +- asn1/ros/Makefile.am | 1 + asn1/ros/Makefile.nmake | 3 +- asn1/rrc/Makefile.am | 1 + asn1/rrc/Makefile.nmake | 3 +- asn1/rrlp/Makefile.am | 1 + asn1/rrlp/Makefile.nmake | 3 +- asn1/rtse/Makefile.am | 1 + asn1/rtse/Makefile.nmake | 3 +- asn1/s4406/Makefile.am | 1 + asn1/s4406/Makefile.nmake | 3 +- asn1/sabp/Makefile.am | 1 + asn1/sabp/Makefile.nmake | 3 +- asn1/smrse/Makefile.am | 1 + asn1/smrse/Makefile.nmake | 3 +- asn1/snmp/Makefile.am | 1 + asn1/snmp/Makefile.nmake | 3 +- asn1/spnego/Makefile.am | 1 + asn1/spnego/Makefile.nmake | 3 +- asn1/t38/Makefile.am | 1 + asn1/t38/Makefile.nmake | 3 +- asn1/tcap/Makefile.am | 1 + asn1/tcap/Makefile.nmake | 3 +- asn1/ulp/Makefile.am | 1 + asn1/ulp/Makefile.nmake | 3 +- asn1/wlancertextn/Makefile.am | 1 + asn1/wlancertextn/Makefile.nmake | 3 +- asn1/x411/Makefile.am | 1 + asn1/x411/Makefile.nmake | 3 +- asn1/x420/Makefile.am | 1 + asn1/x420/Makefile.nmake | 3 +- asn1/x509af/Makefile.am | 1 + asn1/x509af/Makefile.nmake | 3 +- asn1/x509ce/Makefile.am | 1 + asn1/x509ce/Makefile.nmake | 3 +- asn1/x509if/Makefile.am | 1 + asn1/x509if/Makefile.nmake | 3 +- asn1/x509sat/Makefile.am | 1 + asn1/x509sat/Makefile.nmake | 3 +- asn1/x721/Makefile.am | 1 + 119 files changed, 242 insertions(+), 147 deletions(-) diff --git a/asn1/Makefile.nmake b/asn1/Makefile.nmake index ec9f8ce5a6..6f104140c8 100644 --- a/asn1/Makefile.nmake +++ b/asn1/Makefile.nmake @@ -27,8 +27,9 @@ all: ber per ber: \ acse \ - acp133 \ - ansi_map \ + acp133 \ + ansi_map \ + ansi-tcap \ camel \ cdt \ cmip \ @@ -60,6 +61,7 @@ ber: \ pkixtsp \ pres \ q932 \ + q932-ros \ qsig \ ros \ rtse \ @@ -81,6 +83,7 @@ per: \ h235 \ h245 \ h450 \ + h450-ros \ nbap \ mpeg-audio \ mpeg-pes \ @@ -93,10 +96,10 @@ per: \ ulp clean: - cd acse + cd acp133 $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd .. - cd acp133 + cd acse $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd .. cd ansi_map @@ -117,10 +120,10 @@ clean: cd dap $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd .. - cd dop + cd disp $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd .. - cd disp + cd dop $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd .. cd dsp @@ -297,6 +300,11 @@ acp133:: $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake copy_files cd .. +ansi-tcap:: + cd ansi-tcap + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake copy_files + cd .. + ansi_map:: cd ansi_map $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake copy_files @@ -386,6 +394,11 @@ h450:: $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake copy_files cd .. +h450-ros:: + cd h450-ros + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake copy_files + cd .. + inap:: cd inap $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake copy_files @@ -491,6 +504,11 @@ q932:: $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake copy_files cd .. +q932-ros:: + cd q932-ros + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake copy_files + cd .. + qsig:: cd qsig $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake copy_files @@ -581,11 +599,6 @@ x420:: $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake copy_files cd .. -x501:: - cd x501 - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake copy_files - cd .. - x509af:: cd x509af $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake copy_files diff --git a/asn1/acp133/Makefile.am b/asn1/acp133/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/acp133/Makefile.am +++ b/asn1/acp133/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/acp133/Makefile.nmake b/asn1/acp133/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/acp133/Makefile.nmake +++ b/asn1/acp133/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/acse/Makefile.am b/asn1/acse/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/acse/Makefile.am +++ b/asn1/acse/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/acse/Makefile.nmake b/asn1/acse/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/acse/Makefile.nmake +++ b/asn1/acse/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/ansi-tcap/Makefile.am b/asn1/ansi-tcap/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/ansi-tcap/Makefile.am +++ b/asn1/ansi-tcap/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/ansi-tcap/Makefile.nmake b/asn1/ansi-tcap/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/ansi-tcap/Makefile.nmake +++ b/asn1/ansi-tcap/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/ansi_map/Makefile.am b/asn1/ansi_map/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/ansi_map/Makefile.am +++ b/asn1/ansi_map/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/ansi_map/Makefile.nmake b/asn1/ansi_map/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/ansi_map/Makefile.nmake +++ b/asn1/ansi_map/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/camel/Makefile.am b/asn1/camel/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/camel/Makefile.am +++ b/asn1/camel/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/camel/Makefile.nmake b/asn1/camel/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/camel/Makefile.nmake +++ b/asn1/camel/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/cdt/Makefile.am b/asn1/cdt/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/cdt/Makefile.am +++ b/asn1/cdt/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/cdt/Makefile.nmake b/asn1/cdt/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/cdt/Makefile.nmake +++ b/asn1/cdt/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/cmip/Makefile.am b/asn1/cmip/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/cmip/Makefile.am +++ b/asn1/cmip/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/cmip/Makefile.nmake b/asn1/cmip/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/cmip/Makefile.nmake +++ b/asn1/cmip/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/cms/Makefile.am b/asn1/cms/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/cms/Makefile.am +++ b/asn1/cms/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/cms/Makefile.nmake b/asn1/cms/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/cms/Makefile.nmake +++ b/asn1/cms/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/dap/Makefile.am b/asn1/dap/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/dap/Makefile.am +++ b/asn1/dap/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/dap/Makefile.nmake b/asn1/dap/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/dap/Makefile.nmake +++ b/asn1/dap/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/disp/Makefile.am b/asn1/disp/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/disp/Makefile.am +++ b/asn1/disp/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/disp/Makefile.nmake b/asn1/disp/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/disp/Makefile.nmake +++ b/asn1/disp/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/dop/Makefile.am b/asn1/dop/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/dop/Makefile.am +++ b/asn1/dop/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/dop/Makefile.nmake b/asn1/dop/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/dop/Makefile.nmake +++ b/asn1/dop/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/dsp/Makefile.am b/asn1/dsp/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/dsp/Makefile.am +++ b/asn1/dsp/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/dsp/Makefile.nmake b/asn1/dsp/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/dsp/Makefile.nmake +++ b/asn1/dsp/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/ess/Makefile.am b/asn1/ess/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/ess/Makefile.am +++ b/asn1/ess/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/ess/Makefile.nmake b/asn1/ess/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/ess/Makefile.nmake +++ b/asn1/ess/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/ftam/Makefile.am b/asn1/ftam/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/ftam/Makefile.am +++ b/asn1/ftam/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/ftam/Makefile.nmake b/asn1/ftam/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/ftam/Makefile.nmake +++ b/asn1/ftam/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/gnm/Makefile.am b/asn1/gnm/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/gnm/Makefile.am +++ b/asn1/gnm/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/gnm/Makefile.nmake b/asn1/gnm/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/gnm/Makefile.nmake +++ b/asn1/gnm/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/gsmmap/Makefile.am b/asn1/gsmmap/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/gsmmap/Makefile.am +++ b/asn1/gsmmap/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/gsmmap/Makefile.nmake b/asn1/gsmmap/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/gsmmap/Makefile.nmake +++ b/asn1/gsmmap/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/h248/Makefile.am b/asn1/h248/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/h248/Makefile.am +++ b/asn1/h248/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/h248/Makefile.nmake b/asn1/h248/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/h248/Makefile.nmake +++ b/asn1/h248/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.nmake b/asn1/h450/Makefile.nmake index 5a32997c60..0e49c7e460 100644 --- a/asn1/h450/Makefile.nmake +++ b/asn1/h450/Makefile.nmake @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id$ +# $Id: Makefile.nmake 23131 2007-10-10 10:25:09Z kukosa $ # # # Wireshark - Network traffic analyzer diff --git a/asn1/inap/Makefile.am b/asn1/inap/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/inap/Makefile.am +++ b/asn1/inap/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/inap/Makefile.nmake b/asn1/inap/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/inap/Makefile.nmake +++ b/asn1/inap/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/ldap/Makefile.am b/asn1/ldap/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/ldap/Makefile.am +++ b/asn1/ldap/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/ldap/Makefile.nmake b/asn1/ldap/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/ldap/Makefile.nmake +++ b/asn1/ldap/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/logotype-cert-extn/Makefile.am b/asn1/logotype-cert-extn/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/logotype-cert-extn/Makefile.am +++ b/asn1/logotype-cert-extn/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/logotype-cert-extn/Makefile.nmake b/asn1/logotype-cert-extn/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/logotype-cert-extn/Makefile.nmake +++ b/asn1/logotype-cert-extn/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/mms/Makefile.am b/asn1/mms/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/mms/Makefile.am +++ b/asn1/mms/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/mms/Makefile.nmake b/asn1/mms/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/mms/Makefile.nmake +++ b/asn1/mms/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/mpeg-audio/Makefile.am b/asn1/mpeg-audio/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/mpeg-audio/Makefile.am +++ b/asn1/mpeg-audio/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/mpeg-audio/Makefile.nmake b/asn1/mpeg-audio/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/mpeg-audio/Makefile.nmake +++ b/asn1/mpeg-audio/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/mpeg-pes/Makefile.am b/asn1/mpeg-pes/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/mpeg-pes/Makefile.am +++ b/asn1/mpeg-pes/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/mpeg-pes/Makefile.nmake b/asn1/mpeg-pes/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/mpeg-pes/Makefile.nmake +++ b/asn1/mpeg-pes/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/nbap/Makefile.am b/asn1/nbap/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/nbap/Makefile.am +++ b/asn1/nbap/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/nbap/Makefile.nmake b/asn1/nbap/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/nbap/Makefile.nmake +++ b/asn1/nbap/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/ns-cert-exts/Makefile.am b/asn1/ns-cert-exts/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/ns-cert-exts/Makefile.am +++ b/asn1/ns-cert-exts/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/ns-cert-exts/Makefile.nmake b/asn1/ns-cert-exts/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/ns-cert-exts/Makefile.nmake +++ b/asn1/ns-cert-exts/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/ocsp/Makefile.am b/asn1/ocsp/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/ocsp/Makefile.am +++ b/asn1/ocsp/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/ocsp/Makefile.nmake b/asn1/ocsp/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/ocsp/Makefile.nmake +++ b/asn1/ocsp/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/pkcs1/Makefile.am b/asn1/pkcs1/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/pkcs1/Makefile.am +++ b/asn1/pkcs1/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/pkcs1/Makefile.nmake b/asn1/pkcs1/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/pkcs1/Makefile.nmake +++ b/asn1/pkcs1/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/pkcs12/Makefile.am b/asn1/pkcs12/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/pkcs12/Makefile.am +++ b/asn1/pkcs12/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/pkcs12/Makefile.nmake b/asn1/pkcs12/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/pkcs12/Makefile.nmake +++ b/asn1/pkcs12/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/pkinit/Makefile.am b/asn1/pkinit/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/pkinit/Makefile.am +++ b/asn1/pkinit/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/pkinit/Makefile.nmake b/asn1/pkinit/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/pkinit/Makefile.nmake +++ b/asn1/pkinit/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/pkix1explicit/Makefile.am b/asn1/pkix1explicit/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/pkix1explicit/Makefile.am +++ b/asn1/pkix1explicit/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/pkix1explicit/Makefile.nmake b/asn1/pkix1explicit/Makefile.nmake index ff589fbd9c..5a32997c60 100644 --- a/asn1/pkix1explicit/Makefile.nmake +++ b/asn1/pkix1explicit/Makefile.nmake @@ -1,45 +1,29 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # # $Id$ +# +# +# Wireshark - Network traffic analyzer +# By Gerald Combs +# 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. -include ../../config.nmake - -UNIX2DOS=$(PERL) ../../tools/unix2dos.pl - -PROTOCOL_NAME=pkix1explicit -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h - -all: generate_dissector - -generate_dissector: $(DISSECTOR_FILES) - -$(DISSECTOR_FILES): ../../tools/asn2wrs.py PKIX1EXPLICIT93.asn packet-pkix1explicit-template.c packet-pkix1explicit-template.h pkix1explicit.cnf -!IFDEF PYTHON - $(PYTHON) "../../tools/asn2wrs.py" -e -b -X -T -p $(PROTOCOL_NAME) -c pkix1explicit.cnf -s packet-pkix1explicit-template PKIX1EXPLICIT93.asn -!ELSE - @echo Error: You need Python to use asn2wrs.py - @exit 1 -!ENDIF - -clean: - rm -f parsetab.py parsetab.pyc $(DISSECTOR_FILES) - -distclean: clean - -maintainer-clean: distclean - -# Fix EOL in generated dissectors. Cygwin's python generates files with -# mixed EOL styles, which can't be commited to the SVN repository. -# Stuff included from template and "cnf" files has "\r\n" on windows, while -# the generated stuff has "\n". -fix_eol: generate_dissector - move packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).c.tmp - move packet-$(PROTOCOL_NAME).h packet-$(PROTOCOL_NAME).h.tmp - $(UNIX2DOS) < packet-$(PROTOCOL_NAME).c.tmp > packet-$(PROTOCOL_NAME).c - $(UNIX2DOS) < packet-$(PROTOCOL_NAME).h.tmp > packet-$(PROTOCOL_NAME).h - del /f packet-$(PROTOCOL_NAME).c.tmp packet-$(PROTOCOL_NAME).h.tmp +include ../../config.nmake +include ../Makefile.preinc.nmake +include Makefile.common +include ../Makefile.inc.nmake -copy_files: generate_dissector fix_eol - xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d /y - xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d /y diff --git a/asn1/pkix1implicit/Makefile.am b/asn1/pkix1implicit/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/pkix1implicit/Makefile.am +++ b/asn1/pkix1implicit/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/pkix1implicit/Makefile.nmake b/asn1/pkix1implicit/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/pkix1implicit/Makefile.nmake +++ b/asn1/pkix1implicit/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/pkixcmp/Makefile.am b/asn1/pkixcmp/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/pkixcmp/Makefile.am +++ b/asn1/pkixcmp/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/pkixcmp/Makefile.nmake b/asn1/pkixcmp/Makefile.nmake index 4dd7b2f792..5a32997c60 100644 --- a/asn1/pkixcmp/Makefile.nmake +++ b/asn1/pkixcmp/Makefile.nmake @@ -1,46 +1,29 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # # $Id$ +# +# +# Wireshark - Network traffic analyzer +# By Gerald Combs +# 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. -include ../../config.nmake - -UNIX2DOS=$(PERL) ../../tools/unix2dos.pl - -PROTOCOL_NAME=cmp -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h - -all: generate_dissector - -generate_dissector: $(DISSECTOR_FILES) - -$(DISSECTOR_FILES): ../../tools/asn2wrs.py CMP.asn packet-cmp-template.c packet-cmp-template.h cmp.cnf -!IFDEF PYTHON - $(PYTHON) "../../tools/asn2wrs.py" -b -X -T -e -p $(PROTOCOL_NAME) -c cmp.cnf -s packet-cmp-template CMP.asn -!ELSE - @echo Error: You need Python to use asn2wrs.py - @exit 1 -!ENDIF - -clean: - rm -f parsetab.py parsetab.pyc $(DISSECTOR_FILES) - -distclean: clean - -maintainer-clean: distclean - -# Fix EOL in generated dissectors. Cygwin's python generates files with -# mixed EOL styles, which can't be commited to the SVN repository. -# Stuff included from template and "cnf" files has "\r\n" on windows, while -# the generated stuff has "\n". - -fix_eol: generate_dissector - move packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).c.tmp - move packet-$(PROTOCOL_NAME).h packet-$(PROTOCOL_NAME).h.tmp - $(UNIX2DOS) < packet-$(PROTOCOL_NAME).c.tmp > packet-$(PROTOCOL_NAME).c - $(UNIX2DOS) < packet-$(PROTOCOL_NAME).h.tmp > packet-$(PROTOCOL_NAME).h - del /f packet-$(PROTOCOL_NAME).c.tmp packet-$(PROTOCOL_NAME).h.tmp -copy_files: generate_dissector fix_eol - xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d /y - xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d /y +include ../../config.nmake +include ../Makefile.preinc.nmake +include Makefile.common +include ../Makefile.inc.nmake diff --git a/asn1/pkixcrmf/Makefile.am b/asn1/pkixcrmf/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/pkixcrmf/Makefile.am +++ b/asn1/pkixcrmf/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/pkixcrmf/Makefile.nmake b/asn1/pkixcrmf/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/pkixcrmf/Makefile.nmake +++ b/asn1/pkixcrmf/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/pkixproxy/Makefile.am b/asn1/pkixproxy/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/pkixproxy/Makefile.am +++ b/asn1/pkixproxy/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/pkixproxy/Makefile.nmake b/asn1/pkixproxy/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/pkixproxy/Makefile.nmake +++ b/asn1/pkixproxy/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/pkixqualified/Makefile.am b/asn1/pkixqualified/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/pkixqualified/Makefile.am +++ b/asn1/pkixqualified/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/pkixqualified/Makefile.nmake b/asn1/pkixqualified/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/pkixqualified/Makefile.nmake +++ b/asn1/pkixqualified/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/pkixtsp/Makefile.am b/asn1/pkixtsp/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/pkixtsp/Makefile.am +++ b/asn1/pkixtsp/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/pkixtsp/Makefile.nmake b/asn1/pkixtsp/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/pkixtsp/Makefile.nmake +++ b/asn1/pkixtsp/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/pres/Makefile.am b/asn1/pres/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/pres/Makefile.am +++ b/asn1/pres/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/pres/Makefile.nmake b/asn1/pres/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/pres/Makefile.nmake +++ b/asn1/pres/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/ranap/Makefile.am b/asn1/ranap/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/ranap/Makefile.am +++ b/asn1/ranap/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/ranap/Makefile.nmake b/asn1/ranap/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/ranap/Makefile.nmake +++ b/asn1/ranap/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/rnsap/Makefile.am b/asn1/rnsap/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/rnsap/Makefile.am +++ b/asn1/rnsap/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/rnsap/Makefile.nmake b/asn1/rnsap/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/rnsap/Makefile.nmake +++ b/asn1/rnsap/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/ros/Makefile.am b/asn1/ros/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/ros/Makefile.am +++ b/asn1/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/ros/Makefile.nmake b/asn1/ros/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/ros/Makefile.nmake +++ b/asn1/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/rrc/Makefile.am b/asn1/rrc/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/rrc/Makefile.am +++ b/asn1/rrc/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/rrc/Makefile.nmake b/asn1/rrc/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/rrc/Makefile.nmake +++ b/asn1/rrc/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/rrlp/Makefile.am b/asn1/rrlp/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/rrlp/Makefile.am +++ b/asn1/rrlp/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/rrlp/Makefile.nmake b/asn1/rrlp/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/rrlp/Makefile.nmake +++ b/asn1/rrlp/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/rtse/Makefile.am b/asn1/rtse/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/rtse/Makefile.am +++ b/asn1/rtse/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/rtse/Makefile.nmake b/asn1/rtse/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/rtse/Makefile.nmake +++ b/asn1/rtse/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/s4406/Makefile.am b/asn1/s4406/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/s4406/Makefile.am +++ b/asn1/s4406/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/s4406/Makefile.nmake b/asn1/s4406/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/s4406/Makefile.nmake +++ b/asn1/s4406/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/sabp/Makefile.am b/asn1/sabp/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/sabp/Makefile.am +++ b/asn1/sabp/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/sabp/Makefile.nmake b/asn1/sabp/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/sabp/Makefile.nmake +++ b/asn1/sabp/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/smrse/Makefile.am b/asn1/smrse/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/smrse/Makefile.am +++ b/asn1/smrse/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/smrse/Makefile.nmake b/asn1/smrse/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/smrse/Makefile.nmake +++ b/asn1/smrse/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/snmp/Makefile.am b/asn1/snmp/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/snmp/Makefile.am +++ b/asn1/snmp/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/snmp/Makefile.nmake b/asn1/snmp/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/snmp/Makefile.nmake +++ b/asn1/snmp/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/spnego/Makefile.am b/asn1/spnego/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/spnego/Makefile.am +++ b/asn1/spnego/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/spnego/Makefile.nmake b/asn1/spnego/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/spnego/Makefile.nmake +++ b/asn1/spnego/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/t38/Makefile.am b/asn1/t38/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/t38/Makefile.am +++ b/asn1/t38/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/t38/Makefile.nmake b/asn1/t38/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/t38/Makefile.nmake +++ b/asn1/t38/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/tcap/Makefile.am b/asn1/tcap/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/tcap/Makefile.am +++ b/asn1/tcap/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/tcap/Makefile.nmake b/asn1/tcap/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/tcap/Makefile.nmake +++ b/asn1/tcap/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/ulp/Makefile.am b/asn1/ulp/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/ulp/Makefile.am +++ b/asn1/ulp/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/ulp/Makefile.nmake b/asn1/ulp/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/ulp/Makefile.nmake +++ b/asn1/ulp/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/wlancertextn/Makefile.am b/asn1/wlancertextn/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/wlancertextn/Makefile.am +++ b/asn1/wlancertextn/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/wlancertextn/Makefile.nmake b/asn1/wlancertextn/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/wlancertextn/Makefile.nmake +++ b/asn1/wlancertextn/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/x411/Makefile.am b/asn1/x411/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/x411/Makefile.am +++ b/asn1/x411/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/x411/Makefile.nmake b/asn1/x411/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/x411/Makefile.nmake +++ b/asn1/x411/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/x420/Makefile.am b/asn1/x420/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/x420/Makefile.am +++ b/asn1/x420/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/x420/Makefile.nmake b/asn1/x420/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/x420/Makefile.nmake +++ b/asn1/x420/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/x509af/Makefile.am b/asn1/x509af/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/x509af/Makefile.am +++ b/asn1/x509af/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/x509af/Makefile.nmake b/asn1/x509af/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/x509af/Makefile.nmake +++ b/asn1/x509af/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/x509ce/Makefile.am b/asn1/x509ce/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/x509ce/Makefile.am +++ b/asn1/x509ce/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/x509ce/Makefile.nmake b/asn1/x509ce/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/x509ce/Makefile.nmake +++ b/asn1/x509ce/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/x509if/Makefile.am b/asn1/x509if/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/x509if/Makefile.am +++ b/asn1/x509if/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/x509if/Makefile.nmake b/asn1/x509if/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/x509if/Makefile.nmake +++ b/asn1/x509if/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/x509sat/Makefile.am b/asn1/x509sat/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/x509sat/Makefile.am +++ b/asn1/x509sat/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/x509sat/Makefile.nmake b/asn1/x509sat/Makefile.nmake index b3fa922696..5a32997c60 100644 --- a/asn1/x509sat/Makefile.nmake +++ b/asn1/x509sat/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/x721/Makefile.am b/asn1/x721/Makefile.am index a034690647..462af31e88 100644 --- a/asn1/x721/Makefile.am +++ b/asn1/x721/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 -- cgit v1.2.3