From 8aefa8d2f022357a9baa402029afcf60282e31b7 Mon Sep 17 00:00:00 2001 From: "briano%netscape.com" Date: Fri, 10 Sep 1999 00:59:21 +0000 Subject: [PATCH] General cleanup. git-svn-id: svn://10.0.0.236/trunk@46678 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/db/Makefile.in | 10 +++----- mozilla/netwerk/mime/Makefile.in | 13 +++------- mozilla/netwerk/socket/Makefile.in | 11 +++------ mozilla/netwerk/socket/base/Makefile.in | 33 ++++++++++--------------- mozilla/netwerk/streamconv/Makefile.in | 18 ++++---------- mozilla/netwerk/testserver/Makefile.in | 17 ++++++------- mozilla/netwerk/util/Makefile.in | 13 +++------- mozilla/tools/testserver/Makefile.in | 17 ++++++------- 8 files changed, 49 insertions(+), 83 deletions(-) diff --git a/mozilla/db/Makefile.in b/mozilla/db/Makefile.in index db5f6ddc14e..a0e9aca500f 100644 --- a/mozilla/db/Makefile.in +++ b/mozilla/db/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,17 +13,16 @@ # 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@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = mdb mork - -include $(topsrcdir)/config/config.mk +DIRS = mdb mork include $(topsrcdir)/config/rules.mk diff --git a/mozilla/netwerk/mime/Makefile.in b/mozilla/netwerk/mime/Makefile.in index 143fb8b3729..f2fb37485a7 100644 --- a/mozilla/netwerk/mime/Makefile.in +++ b/mozilla/netwerk/mime/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,20 +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@ -MODULE = mime - include $(DEPTH)/config/autoconf.mk -DIRS= \ - public \ - src \ - $(NULL) +DIRS = public src include $(topsrcdir)/config/rules.mk + diff --git a/mozilla/netwerk/socket/Makefile.in b/mozilla/netwerk/socket/Makefile.in index d64392ad73c..6f1cf7fb2bb 100755 --- a/mozilla/netwerk/socket/Makefile.in +++ b/mozilla/netwerk/socket/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,20 +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@ -MODULE = necko - include $(DEPTH)/config/autoconf.mk -DIRS= \ - base \ - $(NULL) +DIRS = base include $(topsrcdir)/config/rules.mk diff --git a/mozilla/netwerk/socket/base/Makefile.in b/mozilla/netwerk/socket/base/Makefile.in index 7f6a0ce04a0..1516594bd63 100755 --- a/mozilla/netwerk/socket/base/Makefile.in +++ b/mozilla/netwerk/socket/base/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,36 +13,30 @@ # 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@ -MODULE = necko -XPIDL_MODULE = necko_socket - -LIBRARY_NAME = neckosocket_s - include $(DEPTH)/config/autoconf.mk -XPIDLSRCS = \ - nsISocketProvider.idl \ - nsISocketProviderService.idl \ - $(NULL) +MODULE = necko +XPIDL_MODULE = necko_socket +LIBRARY_NAME = neckosocket_s -CPPSRCS = \ - nsSocketProviderService.cpp \ - $(NULL) +CPPSRCS = nsSocketProviderService.cpp -include $(topsrcdir)/config/config.mk +XPIDLSRCS = \ + nsISocketProvider.idl \ + nsISocketProviderService.idl \ + $(NULL) -MKSHLIB := - -# we don't want the shared lib, but we want to force the creation of a -# static l\ib. +# we don't want the shared lib, but we want to force the creation of a +# static lib. override NO_SHARED_LIB=1 override NO_STATIC_LIB= include $(topsrcdir)/config/rules.mk + diff --git a/mozilla/netwerk/streamconv/Makefile.in b/mozilla/netwerk/streamconv/Makefile.in index de4b543496f..fcec1964b18 100644 --- a/mozilla/netwerk/streamconv/Makefile.in +++ b/mozilla/netwerk/streamconv/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,27 +13,20 @@ # 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@ -MODULE = streamconv - include $(DEPTH)/config/autoconf.mk -DIRS= \ - public \ - src \ - converters \ - $(NULL) +DIRS = public src converters ifdef ENABLE_TESTS -DIRS+= \ - test \ - $(NULL) +DIRS += test endif include $(topsrcdir)/config/rules.mk + diff --git a/mozilla/netwerk/testserver/Makefile.in b/mozilla/netwerk/testserver/Makefile.in index 52eabbb7c04..8c7d9835e81 100644 --- a/mozilla/netwerk/testserver/Makefile.in +++ b/mozilla/netwerk/testserver/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,25 +13,25 @@ # 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 -JSRCS = \ - ScriptFile.java \ - Connection.java \ - TestServer.java \ - $(NULL) +JSRCS = \ + ScriptFile.java \ + Connection.java \ + TestServer.java \ + $(NULL) +include $(topsrcdir)/config/rules.mk # Hack rule, this probably needs to be changed # to something official. Works on Solaris for me. -mcafee install:: javac $(JSRCS) -include $(topsrcdir)/config/rules.mk diff --git a/mozilla/netwerk/util/Makefile.in b/mozilla/netwerk/util/Makefile.in index bd5680155de..f2fb37485a7 100644 --- a/mozilla/netwerk/util/Makefile.in +++ b/mozilla/netwerk/util/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,20 +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@ -MODULE = necko - include $(DEPTH)/config/autoconf.mk -DIRS= \ - public \ - src \ - $(NULL) +DIRS = public src include $(topsrcdir)/config/rules.mk + diff --git a/mozilla/tools/testserver/Makefile.in b/mozilla/tools/testserver/Makefile.in index 52eabbb7c04..8c7d9835e81 100644 --- a/mozilla/tools/testserver/Makefile.in +++ b/mozilla/tools/testserver/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,25 +13,25 @@ # 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 -JSRCS = \ - ScriptFile.java \ - Connection.java \ - TestServer.java \ - $(NULL) +JSRCS = \ + ScriptFile.java \ + Connection.java \ + TestServer.java \ + $(NULL) +include $(topsrcdir)/config/rules.mk # Hack rule, this probably needs to be changed # to something official. Works on Solaris for me. -mcafee install:: javac $(JSRCS) -include $(topsrcdir)/config/rules.mk