Removed the obsolete non-NECKO leftovers.

netwerk/protocol/resource/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,35 +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@
 
-MODULE = necko
-
-LIBRARY_NAME = necko_resource
-
-IS_COMPONENT = 1
-
 include $(DEPTH)/config/autoconf.mk
 
-CPPSRCS =			      \
-        nsResourceProtocolHandler.cpp \
-        nsResourceProtocolFactory.cpp \
-        $(NULL)
+MODULE		= necko
+LIBRARY_NAME	= necko_resource
+IS_COMPONENT	= 1
 
-REQUIRES = xpcom necko 
+REQUIRES	= xpcom necko
 
-include $(topsrcdir)/config/config.mk
-
-# hack until necko lands
-ifndef NECKO
-PUBLIC = $(DEPTH)/netwerk/dist/include
-endif
-
-TARGET = $(LIBARY)
+CPPSRCS		= \
+		nsResourceProtocolHandler.cpp \
+		nsResourceProtocolFactory.cpp \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
+

netwerk/streamconv/converters/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,39 +13,24 @@
 # 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 = converters
-
-LIBRARY_NAME = converters
-
-IS_COMPONENT = 1
-
-
-EXPORTS = \
-	nsMultiMixedConv.h  \
-	$(NULL)
-
 include $(DEPTH)/config/autoconf.mk
 
-CPPSRCS =                              \
-        nsMultiMixedConv.cpp \
-        $(NULL)
+MODULE		= converters
+LIBRARY_NAME	= converters
+IS_COMPONENT	= 1
 
-include $(topsrcdir)/config/config.mk
+REQUIRES	= xpcom
 
-REQUIRES = xpcom
+CPPSRCS		= nsMultiMixedConv.cpp
 
-# hack until necko lands
-ifndef NECKO
-PUBLIC = $(DEPTH)/netwerk/dist/include
-endif
-
-TARGET = $(LIBARY)
+EXPORTS		= nsMultiMixedConv.h
 
 include $(topsrcdir)/config/rules.mk
+

netwerk/streamconv/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,28 +13,22 @@
 # 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
-XPIDL_MODULE = necko_stream_converter
-
-XPIDLSRCS =                      \
-        nsIStreamConverter.idl   \
-        nsIStreamConverterService.idl \
-        $(NULL)
-
 include $(DEPTH)/config/autoconf.mk
 
-include $(topsrcdir)/config/config.mk
+MODULE		= streamconv
+XPIDL_MODULE	= necko_stream_converter
 
-# hack until necko lands
-ifndef NECKO
-PUBLIC = $(DEPTH)/netwerk/dist/include
-endif
+XPIDLSRCS	= \
+		nsIStreamConverter.idl \
+		nsIStreamConverterService.idl \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
+

netwerk/streamconv/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,35 +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@
 
-MODULE = streamconv
-
-LIBRARY_NAME = streamconv
-
-IS_COMPONENT = 1
-
 include $(DEPTH)/config/autoconf.mk
 
-CPPSRCS =                              \
-        nsStreamConverterService.cpp   \
-        nsStreamConvServiceFactory.cpp \
-        $(NULL)
+MODULE		= streamconv
+LIBRARY_NAME	= streamconv
+IS_COMPONENT	= 1
 
-include $(topsrcdir)/config/config.mk
+REQUIRES	= xpcom
 
-REQUIRES = xpcom
-
-# hack until necko lands
-ifndef NECKO
-PUBLIC = $(DEPTH)/netwerk/dist/include
-endif
-
-TARGET = $(LIBARY)
+CPPSRCS		= \
+		nsStreamConverterService.cpp \
+		nsStreamConvServiceFactory.cpp \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
+

netwerk/streamconv/test/Makefile.in

@@ -22,14 +22,14 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-PROGRAM	=	TestStreamConv
-MODULE  = 	TestStreamConv
+MODULE		= TestStreamConv
+PROGRAM		= TestStreamConv
 
 REQUIRES	= libreg xpcom
 
-CPPSRCS		= 			\
-		Converters.cpp 		\
-		TestStreamConv.cpp 	\
+CPPSRCS		= \
+		Converters.cpp \
+		TestStreamConv.cpp \
 		$(NULL)
 
 ifdef NO_LD_ARCHIVE_FLAGS
@@ -42,13 +42,7 @@ LIBS		= \
 		$(NSPR_LIBS) \
 		$(NULL)
 
-include $(topsrcdir)/config/config.mk
-
-# hack until necko lands
-ifndef NECKO
-PUBLIC		= $(DEPTH)/netwerk/dist/include
-endif
-
 include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -DUSE_NSREG
+