From 6860ae4df4fe8996c883b7ca60d8a9e7501f8a45 Mon Sep 17 00:00:00 2001 From: "briano%netscape.com" Date: Wed, 1 Sep 1999 23:27:16 +0000 Subject: [PATCH] Cleaned it up and eliminated the pointless #!gmake. git-svn-id: svn://10.0.0.236/trunk@45556 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/build/Makefile.in | 7 ++---- mozilla/build/unix/Makefile.in | 10 ++++----- mozilla/caps/Makefile.in | 7 +++--- mozilla/caps/idl/Makefile.in | 25 ++++++++++----------- mozilla/caps/include/Makefile.in | 23 ++++++++++---------- mozilla/dbm/Makefile.in | 15 ++++++------- mozilla/dbm/include/Makefile.in | 37 +++++++++++++++----------------- 7 files changed, 58 insertions(+), 66 deletions(-) diff --git a/mozilla/build/Makefile.in b/mozilla/build/Makefile.in index 86b1a97492b..e07aba374b3 100644 --- a/mozilla/build/Makefile.in +++ b/mozilla/build/Makefile.in @@ -1,4 +1,3 @@ -#!gmake # # The contents of this file are subject to the Netscape Public License # Version 1.0 (the "License"); you may not use this file except in @@ -19,16 +18,14 @@ # Reserved. # -DEPTH = .. +DEPTH = .. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = unix +DIRS = unix -include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/rules.mk - diff --git a/mozilla/build/unix/Makefile.in b/mozilla/build/unix/Makefile.in index aa321347475..c784d30931b 100644 --- a/mozilla/build/unix/Makefile.in +++ b/mozilla/build/unix/Makefile.in @@ -1,4 +1,3 @@ -#!gmake # # The contents of this file are subject to the Netscape Public License # Version 1.0 (the "License"); you may not use this file except in @@ -19,18 +18,17 @@ # Reserved. # -DEPTH = ../.. +DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -include $(topsrcdir)/config/config.mk +RUN_MOZILLA_SCRIPT = $(srcdir)/run-mozilla.sh + include $(topsrcdir)/config/rules.mk -RUN_MOZILLA_SCRIPT= $(srcdir)/run-mozilla.sh - -install:: $(PROGRAM) $(RUN_MOZILLA_SCRIPT) +install:: $(RUN_MOZILLA_SCRIPT) $(INSTALL) $(RUN_MOZILLA_SCRIPT) $(DIST)/bin diff --git a/mozilla/caps/Makefile.in b/mozilla/caps/Makefile.in index cea4586b06c..25811c75421 100644 --- a/mozilla/caps/Makefile.in +++ b/mozilla/caps/Makefile.in @@ -1,4 +1,4 @@ -#!gmake +# # The contents of this file are subject to the Netscape Public License # Version 1.0 (the "NPL"); you may not use this file except in # compliance with the NPL. You may obtain a copy of the NPL at @@ -13,15 +13,16 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. +# -DEPTH = .. +DEPTH = .. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = idl include src +DIRS = idl include src include $(topsrcdir)/config/rules.mk diff --git a/mozilla/caps/idl/Makefile.in b/mozilla/caps/idl/Makefile.in index d487c152aa2..edea116af6c 100644 --- a/mozilla/caps/idl/Makefile.in +++ b/mozilla/caps/idl/Makefile.in @@ -1,4 +1,3 @@ -#!gmake # # The contents of this file are subject to the Netscape Public License # Version 1.0 (the "NPL"); you may not use this file except in @@ -14,21 +13,23 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1999 Netscape Communications Corporation. All Rights # Reserved. +# -DEPTH = ../.. -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ +DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = caps +MODULE = caps -XPIDLSRCS = \ - nsIScriptSecurityManager.idl \ - nsIPrincipal.idl \ - nsICodebasePrincipal.idl \ - nsICertificatePrincipal.idl \ - $(NULL) +XPIDLSRCS = \ + nsIScriptSecurityManager.idl \ + nsIPrincipal.idl \ + nsICodebasePrincipal.idl \ + nsICertificatePrincipal.idl \ + $(NULL) include $(topsrcdir)/config/rules.mk + diff --git a/mozilla/caps/include/Makefile.in b/mozilla/caps/include/Makefile.in index e5e4688485c..c4b63ac66d4 100644 --- a/mozilla/caps/include/Makefile.in +++ b/mozilla/caps/include/Makefile.in @@ -1,4 +1,4 @@ -#!gmake +# # The contents of this file are subject to the Netscape Public License # Version 1.0 (the "NPL"); you may not use this file except in # compliance with the NPL. You may obtain a copy of the NPL at @@ -13,25 +13,26 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. +# -MODULE = caps - -DEPTH = ../.. +DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -EXPORTS = \ - nsSystemPrincipal.h \ - nsCertificatePrincipal.h \ - nsCodebasePrincipal.h \ - nsJSPrincipals.h \ - nsScriptSecurityManager.h +MODULE = caps +EXPORTS = \ + nsSystemPrincipal.h \ + nsCertificatePrincipal.h \ + nsCodebasePrincipal.h \ + nsJSPrincipals.h \ + nsScriptSecurityManager.h \ + $(NULL) -EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) +EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/dbm/Makefile.in b/mozilla/dbm/Makefile.in index 09f43b200a7..3393921d16b 100644 --- a/mozilla/dbm/Makefile.in +++ b/mozilla/dbm/Makefile.in @@ -1,4 +1,3 @@ -#! gmake # # The contents of this file are subject to the Netscape Public License # Version 1.0 (the "NPL"); you may not use this file except in @@ -14,24 +13,22 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. +# -DEPTH = .. +DEPTH = .. topsrcdir = @top_srcdir@ VPATH = @srcdir@ srcdir = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = dbm +MODULE = dbm +RELEASE = dbm -RELEASE = dbm - -DIRS = include \ - src \ - $(NULL) +DIRS = include src ifdef ENABLE_TESTS -DIRS += tests +DIRS += tests endif include $(topsrcdir)/config/rules.mk diff --git a/mozilla/dbm/include/Makefile.in b/mozilla/dbm/include/Makefile.in index a3e0c5517f7..de6f911ee2a 100644 --- a/mozilla/dbm/include/Makefile.in +++ b/mozilla/dbm/include/Makefile.in @@ -1,36 +1,33 @@ -#! gmake - -DEPTH = ../.. +DEPTH = ../.. topsrcdir = @top_srcdir@ VPATH = @srcdir@ srcdir = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = dbm +MODULE = dbm -EXPORTS = nsres.h \ - cdefs.h \ +EXPORTS = \ + nsres.h \ + cdefs.h \ mcom_db.h \ ncompat.h \ winfile.h \ $(NULL) -EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) +EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) -PRIVATE_EXPORTS = hsearch.h \ - page.h \ - extern.h \ - ndbm.h \ - queue.h \ - hash.h \ - mpool.h \ - search.h \ - $(NULL) +PRIVATE_EXPORTS = \ + hsearch.h \ + page.h \ + extern.h \ + ndbm.h \ + queue.h \ + hash.h \ + mpool.h \ + search.h \ + $(NULL) -PRIVATE_EXPORTS := $(addprefix $(srcdir)/, $(PRIVATE_EXPORTS)) +PRIVATE_EXPORTS := $(addprefix $(srcdir)/, $(PRIVATE_EXPORTS)) include $(topsrcdir)/config/rules.mk - - -