General cleanup.

1999-09-14 01:35:43 +00:00 · 1999-09-14 01:35:43 +00:00 · a54c669e40
--- a/nav-java/stubs/include/Makefile.in
+++ b/nav-java/stubs/include/Makefile.in
@ -13,11 +13,12 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

@ -28,3 +29,4 @@ EXPORTS	= java.h javasec.h lj.h edtplug.h
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))

 include $(topsrcdir)/config/rules.mk
+
--- a/nav-java/stubs/jri/Makefile.in
+++ b/nav-java/stubs/jri/Makefile.in
@ -13,17 +13,19 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

 MODULE		= java

-EXPORTS	= netscape_applet_EmbeddedObjectNatives.h \
+EXPORTS		= \
+		netscape_applet_EmbeddedObjectNatives.h \
 		netscape_applet_MozillaAppletContext.h \
 		netscape_javascript_JSObject.h \
 		netscape_javascript_JSException.h \
@ -41,3 +43,4 @@ EXPORTS	= netscape_applet_EmbeddedObjectNatives.h \
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))

 include $(topsrcdir)/config/rules.mk
+
--- a/nav-java/stubs/src/Makefile.in
+++ b/nav-java/stubs/src/Makefile.in
@ -13,11 +13,12 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

@ -31,3 +32,4 @@ CSRCS		= stubnj.c
 include $(topsrcdir)/config/rules.mk

 INCLUDES	+= -I$(DEPTH)/dist/public/img -I$(DEPTH)/dist/public/util -I$(DEPTH)/dist/public/layer
+
--- a/netwerk/Makefile.in
+++ b/netwerk/Makefile.in
@ -22,8 +22,6 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE		= necko
-
 DIRS		= \
 		base \
 		dns \
--- a/netwerk/base/Makefile.in
+++ b/netwerk/base/Makefile.in
@ -22,8 +22,6 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE		= necko
-
 DIRS		= public src

 include $(topsrcdir)/config/rules.mk
--- a/netwerk/cache/Makefile.in
+++ b/netwerk/cache/Makefile.in
@ -1,5 +1,3 @@
-# Generated automatically from Makefile.in by configure.
-#!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
@ -15,8 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
-
-
+#

 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
@ -28,3 +25,4 @@ include $(DEPTH)/config/autoconf.mk
 DIRS		= public obj mgr pref module tests

 include $(topsrcdir)/config/rules.mk
+
--- a/netwerk/cache/mgr/Makefile.in
+++ b/netwerk/cache/mgr/Makefile.in
@ -1,5 +1,3 @@
-# Generated automatically from Makefile.in by configure.
-#!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
@ -15,22 +13,20 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
-VPATH = @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= cachemgr
 LIBRARY_NAME	= cachemgr
-MODULE=cachemgr
-IS_COMPONENT=1
+IS_COMPONENT	= 1

-LOCAL_INCLUDES += \
-	-I$(srcdir)/../public \
-	-I$(srcdir)/../include \
-	$(NULL)
+REQUIRES	= nspr

 CPPSRCS		= \
 		nsCacheManager.cpp \
@ -39,17 +35,9 @@ CPPSRCS = \
 		nsBkgThread.cpp \
 		$(NULL)

-EXPORTS =               \
-		 $(NULL)
+LOCAL_INCLUDES	= -I$(srcdir)/../public -I$(srcdir)/../include

-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-REQUIRES	+= nspr
-
-EXTRA_LIBS	+= $(NSPR_LIBS)
-
-include $(topsrcdir)/config/config.mk
-
-#TARGETS = $(LIBRARY)
+EXTRA_LIBS	= $(NSPR_LIBS)

 include $(topsrcdir)/config/rules.mk
+
--- a/netwerk/cache/module/Makefile.in
+++ b/netwerk/cache/module/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,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@ -22,13 +22,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-EXPORTS =               \
-    $(NULL)
-
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
 DIRS		= disk memory

-include $(topsrcdir)/config/config.mk
-
 include $(topsrcdir)/config/rules.mk
+
--- a/netwerk/cache/module/disk/Makefile.in
+++ b/netwerk/cache/module/disk/Makefile.in
@ -1,5 +1,3 @@
-# Generated automatically from Makefile.in by configure.
-# Generated automatically from Makefile.in by configure.
 #
 # 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
@ -15,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
@ -23,17 +22,10 @@ VPATH = @srcdir@

 include $(DEPTH)/config/autoconf.mk

-LIBRARY_NAME = diskcache
-
 MODULE		= diskcache
+LIBRARY_NAME	= diskcache
 IS_COMPONENT	= 1

-LOCAL_INCLUDES += \
-	-I../../public \
-	-I../../include \
-	-I../          \
-	$(NULL)
-
 CPPSRCS		= \
 		nsDiskModule.cpp \
 		nsMonitorable.cpp \
@ -41,21 +33,9 @@ CPPSRCS =			\
 		nsDiskModuleFactory.cpp \
 		$(NULL)

-BASE_LIBS=
+LOCAL_INCLUDES	= -I../../public -I../../include -I..

-NETLIB_LIBS =
-
-LIBS = 
-
-DEFINES		+= 
+include $(topsrcdir)/config/rules.mk

 DSO_LDOPTS	+= -ldb

-include $(topsrcdir)/config/config.mk
-
-# hack until necko lands
-ifndef NECKO
-PUBLIC = $(DEPTH)/netwerk/dist/include
-endif
-
-include $(topsrcdir)/config/rules.mk
--- a/netwerk/cache/module/memory/Makefile.in
+++ b/netwerk/cache/module/memory/Makefile.in
@ -1,5 +1,3 @@
-# Generated automatically from Makefile.in by configure.
-#!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
@ -15,24 +13,20 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
-VPATH = @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= memcache
 LIBRARY_NAME	= memcache
-MODULE=memcache
-IS_COMPONENT=1
+IS_COMPONENT	= 1

-LOCAL_INCLUDES += \
-    -I$(srcdir) \
-	-I$(srcdir)/../../include \
-	-I$(srcdir)/../../public \
-	-I$(srcdir)/.. \
-	$(NULL)
+REQUIRES	= nspr

 CPPSRCS		= \
 		nsMemModule.cpp \
@ -42,16 +36,14 @@ CPPSRCS = \
 		nsMemModuleFactory.cpp \
 		$(NULL)

-EXPORTS = 
+LOCAL_INCLUDES	= \
+		-I$(srcdir) \
+		-I$(srcdir)/../../include \
+		-I$(srcdir)/../../public \
+		-I$(srcdir)/.. \
+		$(NULL)

-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-REQUIRES	+= nspr
-
-EXTRA_LIBS	+= $(NSPR_LIBS)
-
-include $(topsrcdir)/config/config.mk
-
-#TARGETS = $(LIBRARY)
+EXTRA_LIBS	= $(NSPR_LIBS)

 include $(topsrcdir)/config/rules.mk
+
--- a/netwerk/cache/obj/Makefile.in
+++ b/netwerk/cache/obj/Makefile.in
@ -1,5 +1,3 @@
-# Generated automatically from Makefile.in by configure.
-#!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
@ -15,39 +13,30 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
-VPATH = @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= cacheobj
 LIBRARY_NAME	= cacheobj
-MODULE=cacheobj
-IS_COMPONENT=1
+IS_COMPONENT	= 1

-LOCAL_INCLUDES += \
+CPPSRCS		= nsCacheObject.cpp
+
+REQUIRES	= nspr
+
+LOCAL_INCLUDES	= \
 		-I$(srcdir)/../include \
 		-I$(srcdir)/../public \
 		-I$(PUBLIC)/netlib \
 		$(NULL)

-CPPSRCS = \
-	nsCacheObject.cpp	\
-	$(NULL)
-
-EXPORTS =               \
-		 $(NULL)
-
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-REQUIRES	+= nspr
-
-EXTRA_LIBS	+= $(NSPR_LIBS)
-
-include $(topsrcdir)/config/config.mk
-
-#TARGETS = $(LIBRARY)
+EXTRA_LIBS	= $(NSPR_LIBS)

 include $(topsrcdir)/config/rules.mk
+
--- a/netwerk/cache/pref/Makefile.in
+++ b/netwerk/cache/pref/Makefile.in
@ -1,5 +1,3 @@
-# Generated automatically from Makefile.in by configure.
-#!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
@ -15,40 +13,30 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
-VPATH = @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= cachepref
 LIBRARY_NAME	= cachepref
-MODULE=cachepref
-IS_COMPONENT=1
+IS_COMPONENT	= 1

-LOCAL_INCLUDES += \
+CPPSRCS		= nsCachePref.cpp
+
+REQUIRES	= nspr
+
+LOCAL_INCLUDES	= \
 		-I$(srcdir)/../include \
 		-I$(srcdir)/../public \
 		-I$(PUBLIC)/netlib \
 		$(NULL)

-CPPSRCS = \
-	nsCachePref.cpp	\
-#	nsCachePrefFactory.cpp \
-	$(NULL)
-
-EXPORTS = \
-		  $(NULL)
-
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-REQUIRES	+= nspr
-
-EXTRA_LIBS	+= $(NSPR_LIBS)
-
-include $(topsrcdir)/config/config.mk
-
-#TARGETS = $(LIBRARY)
+EXTRA_LIBS	= $(NSPR_LIBS)

 include $(topsrcdir)/config/rules.mk
+
--- a/netwerk/cache/public/Makefile.in
+++ b/netwerk/cache/public/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,8 +13,9 @@
 # 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@
@ -31,8 +31,5 @@ EXPORTS =               \

 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))

-#MODULE = cache
-
-include $(topsrcdir)/config/config.mk
-
 include $(topsrcdir)/config/rules.mk
+
--- a/netwerk/cache/tests/Makefile.in
+++ b/netwerk/cache/tests/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,14 +13,16 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
-VPATH           = @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

 DIRS		= xptest

 include $(topsrcdir)/config/rules.mk
+
--- a/netwerk/cache/tests/xptest/Makefile.in
+++ b/netwerk/cache/tests/xptest/Makefile.in
@ -1,5 +1,3 @@
-# Generated automatically from Makefile.in by configure.
-# Generated automatically from Makefile.in by configure.
 #
 # 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
@ -15,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
@ -23,24 +22,13 @@ VPATH = @srcdir@

 include $(DEPTH)/config/autoconf.mk

-#DIRS		= dynamic
-
 CPPSRCS		= \
 		disktest.cpp \
 		memtest.cpp \
 		$(NULL)

-#PROGRAM = cachetest  
-#LIBRARY_NAME = xpcomsample
 SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=)

-include $(topsrcdir)/config/config.mk
-
-DEFINES		+= -DUSE_NSREG -DCACHE
-LIBS_DIR 	+= -L$(DIST)/bin/components
-INCLUDES	+= -I$(srcdir)/../../public -I$(srcdir)/../../include -I..
-IS_COMPONENT = 
-
 LIBS		= \
 		-lpref \
 		-lsecfree \
@ -50,6 +38,9 @@ LIBS	= \
 		$(NSPR_LIBS) \
 		$(NULL)

-#SIMPLE_PROGRAMS	= $(addprefix $(OBJDIR)/, $(CPPSRCS:.cpp=))
-
 include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -DUSE_NSREG -DCACHE
+LIBS_DIR 	+= -L$(DIST)/bin/components
+INCLUDES	+= -I$(srcdir)/../../public -I$(srcdir)/../../include -I..
+
--- a/netwerk/dns/Makefile.in
+++ b/netwerk/dns/Makefile.in
@ -22,8 +22,6 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE		= necko
-
 DIRS		= public src

 include $(topsrcdir)/config/rules.mk
--- a/netwerk/protocol/Makefile.in
+++ b/netwerk/protocol/Makefile.in
@ -22,16 +22,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE		= necko
-
-DIRS		= \
-		about \
-		data \
-		file \
-		resource \
-		ftp \
-		http \
-		$(NULL)
+DIRS		= about data file resource ftp http

 include $(topsrcdir)/config/rules.mk

--- a/netwerk/protocol/data/src/Makefile.in
+++ b/netwerk/protocol/data/src/Makefile.in
@ -1,3 +1,4 @@
+#
 # 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
@ -12,29 +13,24 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

 DEPTH		= ../../../..
-
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

-LIBRARY_NAME = necko_data
-
-IS_COMPONENT = 1
-
 include $(DEPTH)/config/autoconf.mk

+MODULE		= necko
+LIBRARY_NAME	= necko_data
+IS_COMPONENT	= 1
+
 CPPSRCS		= \
 		nsDataHandler.cpp \
 		nsDataChannel.cpp \
 		nsDataFactory.cpp \
 		$(NULL)

-MODULE = necko
-
-include $(topsrcdir)/config/config.mk
-
-TARGET = $(LIBARY)
-
 include $(topsrcdir)/config/rules.mk
+
--- a/netwerk/protocol/resource/src/Makefile.in
+++ b/netwerk/protocol/resource/src/Makefile.in
@ -34,6 +34,8 @@ CPPSRCS		= \
 		$(NULL)

 include $(topsrcdir)/config/rules.mk
+
 ifeq ($(OS_ARCH), Linux)
 DEFINES		+= -D_BSD_SOURCE
 endif
+
--- a/netwerk/streamconv/converters/Makefile.in
+++ b/netwerk/streamconv/converters/Makefile.in
@ -28,12 +28,14 @@ IS_COMPONENT	= 1

 REQUIRES	= xpcom

-CPPSRCS		= nsMultiMixedConv.cpp \
+CPPSRCS		= \
+		nsMultiMixedConv.cpp \
 		nsFTPDirListingConv.cpp \
 		nsConvFactories.cpp \
 		$(NULL)

-EXPORTS		= nsMultiMixedConv.h \
+EXPORTS		= \
+		nsMultiMixedConv.h \
 		nsFTPDirListingConv.h \
 		$(NULL)