From 4435768ca9f84f80459f7bd30663c1d40afdb837 Mon Sep 17 00:00:00 2001 From: "warren%netscape.com" Date: Tue, 3 Aug 1999 00:38:25 +0000 Subject: [PATCH] Removed hack to export to netwerk/dist (used before landing necko). git-svn-id: svn://10.0.0.236/trunk@41902 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/netwerk/base/src/makefile.win | 5 ----- mozilla/netwerk/build/makefile.win | 6 ------ mozilla/netwerk/dns/public/makefile.win | 6 ------ mozilla/netwerk/dns/src/makefile.win | 6 ------ mozilla/netwerk/mime/public/makefile.win | 5 ----- mozilla/netwerk/mime/src/makefile.win | 5 ----- mozilla/netwerk/protocol/about/public/makefile.win | 6 ------ mozilla/netwerk/protocol/about/src/makefile.win | 6 ------ mozilla/netwerk/protocol/file/public/makefile.win | 5 ----- mozilla/netwerk/protocol/file/src/makefile.win | 5 ----- mozilla/netwerk/protocol/ftp/public/makefile.win | 6 ------ mozilla/netwerk/protocol/ftp/src/makefile.win | 6 ------ mozilla/netwerk/protocol/http/public/makefile.win | 5 ----- mozilla/netwerk/protocol/http/src/makefile.win | 5 ----- mozilla/netwerk/protocol/resource/src/makefile.win | 6 ------ mozilla/netwerk/streamconv/public/makefile.win | 7 ------- mozilla/netwerk/streamconv/src/makefile.win | 6 ------ mozilla/netwerk/test/makefile.win | 6 ------ mozilla/netwerk/util/public/makefile.win | 5 ----- mozilla/netwerk/util/src/makefile.win | 5 ----- 20 files changed, 112 deletions(-) diff --git a/mozilla/netwerk/base/src/makefile.win b/mozilla/netwerk/base/src/makefile.win index 6aadb156a09..782a4e09ee4 100644 --- a/mozilla/netwerk/base/src/makefile.win +++ b/mozilla/netwerk/base/src/makefile.win @@ -18,11 +18,6 @@ MODULE = necko DEPTH = ..\..\.. include <$(DEPTH)/config/config.mak> -// temporary, until we land: -!ifndef NECKO -PUBLIC = $(DEPTH)\netwerk\dist\include -!endif - LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET LIBRARY_NAME=neckobase_s diff --git a/mozilla/netwerk/build/makefile.win b/mozilla/netwerk/build/makefile.win index cf91cadc179..e8c6c4a4115 100644 --- a/mozilla/netwerk/build/makefile.win +++ b/mozilla/netwerk/build/makefile.win @@ -18,12 +18,6 @@ DEPTH=..\.. MODULE=necko -// temporary, until we land: -!ifndef NECKO -include <$(DEPTH)/config/config.mak> -PUBLIC = $(DEPTH)\netwerk\dist\include -!endif - MAKE_OBJ_TYPE=DLL DLLNAME=necko DLL=.\$(OBJDIR)\$(DLLNAME).dll diff --git a/mozilla/netwerk/dns/public/makefile.win b/mozilla/netwerk/dns/public/makefile.win index 95e4260081d..79a3feb8b41 100644 --- a/mozilla/netwerk/dns/public/makefile.win +++ b/mozilla/netwerk/dns/public/makefile.win @@ -20,12 +20,6 @@ MODULE = necko DEPTH = ..\..\.. include <$(DEPTH)/config/config.mak> -// temporary, until we land: -!ifndef NECKO -include <$(DEPTH)/config/config.mak> -PUBLIC = $(DEPTH)\netwerk\dist\include -!endif - XPIDL_MODULE = necko_dns XPIDLSRCS = \ diff --git a/mozilla/netwerk/dns/src/makefile.win b/mozilla/netwerk/dns/src/makefile.win index e337b3847e3..c7d10d08257 100644 --- a/mozilla/netwerk/dns/src/makefile.win +++ b/mozilla/netwerk/dns/src/makefile.win @@ -17,12 +17,6 @@ MODULE = necko DEPTH = ..\..\.. -// temporary, until we land: -!ifndef NECKO -include <$(DEPTH)/config/config.mak> -PUBLIC = $(DEPTH)\netwerk\dist\include -!endif - LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET LIBRARY_NAME=neckodns_s diff --git a/mozilla/netwerk/mime/public/makefile.win b/mozilla/netwerk/mime/public/makefile.win index 433b7f77e84..83603a7a553 100644 --- a/mozilla/netwerk/mime/public/makefile.win +++ b/mozilla/netwerk/mime/public/makefile.win @@ -20,11 +20,6 @@ MODULE = mime DEPTH = ..\..\.. include <$(DEPTH)/config/config.mak> -// temporary, until we land: -!ifndef NECKO -PUBLIC = $(DEPTH)\netwerk\dist\include -!endif - XPIDL_MODULE = mime XPIDLSRCS = \ diff --git a/mozilla/netwerk/mime/src/makefile.win b/mozilla/netwerk/mime/src/makefile.win index f5c1b440810..1de95a9b09d 100644 --- a/mozilla/netwerk/mime/src/makefile.win +++ b/mozilla/netwerk/mime/src/makefile.win @@ -16,11 +16,6 @@ DEPTH = ..\..\.. include <$(DEPTH)/config/config.mak> -// temporary, until we land: -!ifndef NECKO -PUBLIC = $(DEPTH)\netwerk\dist\include -!endif - MODULE = necko IS_COMPONENT=1 diff --git a/mozilla/netwerk/protocol/about/public/makefile.win b/mozilla/netwerk/protocol/about/public/makefile.win index 61a6b3759ef..5cf75854249 100644 --- a/mozilla/netwerk/protocol/about/public/makefile.win +++ b/mozilla/netwerk/protocol/about/public/makefile.win @@ -20,12 +20,6 @@ MODULE = necko DEPTH = ..\..\..\.. include <$(DEPTH)/config/config.mak> -// temporary, until we land: -!ifndef NECKO -include <$(DEPTH)/config/config.mak> -PUBLIC = $(DEPTH)\netwerk\dist\include -!endif - XPIDL_MODULE = necko_about XPIDLSRCS = \ diff --git a/mozilla/netwerk/protocol/about/src/makefile.win b/mozilla/netwerk/protocol/about/src/makefile.win index 00f48b6132e..ad98e8e2342 100644 --- a/mozilla/netwerk/protocol/about/src/makefile.win +++ b/mozilla/netwerk/protocol/about/src/makefile.win @@ -18,12 +18,6 @@ DEPTH=..\..\..\.. MODULE=necko -// temporary, until we land: -!ifndef NECKO -include <$(DEPTH)/config/config.mak> -PUBLIC = $(DEPTH)\netwerk\dist\include -!endif - IS_COMPONENT=1 MAKE_OBJ_TYPE=DLL DLLNAME=necko_about diff --git a/mozilla/netwerk/protocol/file/public/makefile.win b/mozilla/netwerk/protocol/file/public/makefile.win index 2e5193ea39f..6f4289823aa 100644 --- a/mozilla/netwerk/protocol/file/public/makefile.win +++ b/mozilla/netwerk/protocol/file/public/makefile.win @@ -20,11 +20,6 @@ MODULE = necko DEPTH = ..\..\..\.. include <$(DEPTH)/config/config.mak> -// temporary, until we land: -!ifndef NECKO -PUBLIC = $(DEPTH)\netwerk\dist\include -!endif - XPIDL_MODULE = necko_file XPIDLSRCS = \ diff --git a/mozilla/netwerk/protocol/file/src/makefile.win b/mozilla/netwerk/protocol/file/src/makefile.win index 71361335276..14dc525f574 100644 --- a/mozilla/netwerk/protocol/file/src/makefile.win +++ b/mozilla/netwerk/protocol/file/src/makefile.win @@ -19,11 +19,6 @@ DEPTH=..\..\..\.. MODULE=necko include <$(DEPTH)/config/config.mak> -// temporary, until we land: -!ifndef NECKO -PUBLIC = $(DEPTH)\netwerk\dist\include -!endif - IS_COMPONENT=1 MAKE_OBJ_TYPE=DLL DLLNAME=necko_file diff --git a/mozilla/netwerk/protocol/ftp/public/makefile.win b/mozilla/netwerk/protocol/ftp/public/makefile.win index b30129a0b1c..862ce7c95b5 100644 --- a/mozilla/netwerk/protocol/ftp/public/makefile.win +++ b/mozilla/netwerk/protocol/ftp/public/makefile.win @@ -20,12 +20,6 @@ MODULE = necko DEPTH = ..\..\..\.. include <$(DEPTH)/config/config.mak> -// temporary, until we land: -!ifndef NECKO -include <$(DEPTH)/config/config.mak> -PUBLIC = $(DEPTH)\netwerk\dist\include -!endif - XPIDL_MODULE = necko_ftp XPIDLSRCS = \ diff --git a/mozilla/netwerk/protocol/ftp/src/makefile.win b/mozilla/netwerk/protocol/ftp/src/makefile.win index 7720a1e0389..073c66882cf 100644 --- a/mozilla/netwerk/protocol/ftp/src/makefile.win +++ b/mozilla/netwerk/protocol/ftp/src/makefile.win @@ -17,12 +17,6 @@ MODULE = necko DEPTH = ..\..\..\.. -// temporary, until we land: -!ifndef NECKO -include <$(DEPTH)/config/config.mak> -PUBLIC = $(DEPTH)\netwerk\dist\include -!endif - MAKE_OBJ_TYPE=DLL DLLNAME=necko_ftp DLL=.\$(OBJDIR)\$(DLLNAME).dll diff --git a/mozilla/netwerk/protocol/http/public/makefile.win b/mozilla/netwerk/protocol/http/public/makefile.win index 115dfa4da8f..dad91f8f7e2 100644 --- a/mozilla/netwerk/protocol/http/public/makefile.win +++ b/mozilla/netwerk/protocol/http/public/makefile.win @@ -20,11 +20,6 @@ MODULE = necko DEPTH = ..\..\..\.. include <$(DEPTH)/config/config.mak> -// temporary, until we land: -!ifndef NECKO -PUBLIC = $(DEPTH)\netwerk\dist\include -!endif - XPIDL_MODULE = necko_http XPIDLSRCS = \ diff --git a/mozilla/netwerk/protocol/http/src/makefile.win b/mozilla/netwerk/protocol/http/src/makefile.win index 5ecec2eeaa3..15329878dc4 100644 --- a/mozilla/netwerk/protocol/http/src/makefile.win +++ b/mozilla/netwerk/protocol/http/src/makefile.win @@ -28,11 +28,6 @@ DEPTH=..\..\..\.. include <$(DEPTH)/config/config.mak> -// temporary, until we land: -!ifndef NECKO -PUBLIC = $(DEPTH)\netwerk\dist\include -!endif - MODULE=necko IS_COMPONENT=1 diff --git a/mozilla/netwerk/protocol/resource/src/makefile.win b/mozilla/netwerk/protocol/resource/src/makefile.win index 6beae085b46..a129318af7e 100644 --- a/mozilla/netwerk/protocol/resource/src/makefile.win +++ b/mozilla/netwerk/protocol/resource/src/makefile.win @@ -18,12 +18,6 @@ DEPTH=..\..\..\.. MODULE=necko -// temporary, until we land: -!ifndef NECKO -include <$(DEPTH)/config/config.mak> -PUBLIC = $(DEPTH)\netwerk\dist\include -!endif - IS_COMPONENT=1 MAKE_OBJ_TYPE=DLL DLLNAME=necko_resource diff --git a/mozilla/netwerk/streamconv/public/makefile.win b/mozilla/netwerk/streamconv/public/makefile.win index 88cad0fd5b7..040f129757a 100644 --- a/mozilla/netwerk/streamconv/public/makefile.win +++ b/mozilla/netwerk/streamconv/public/makefile.win @@ -19,13 +19,6 @@ MODULE = streamconv DEPTH = ..\..\.. -// temporary, until we land: -!ifndef NECKO -include <$(DEPTH)/config/config.mak> -PUBLIC = $(DEPTH)\netwerk\dist\include -!endif - - XPIDLSRCS = \ .\nsIStreamConverter.idl \ .\nsIStreamConverterService.idl \ diff --git a/mozilla/netwerk/streamconv/src/makefile.win b/mozilla/netwerk/streamconv/src/makefile.win index 4c7b977e7eb..f71bc4069a1 100644 --- a/mozilla/netwerk/streamconv/src/makefile.win +++ b/mozilla/netwerk/streamconv/src/makefile.win @@ -15,12 +15,6 @@ DEPTH = ..\..\.. -// temporary, until we land: -!ifndef NECKO -include <$(DEPTH)/config/config.mak> -PUBLIC = $(DEPTH)\netwerk\dist\include -!endif - MODULE = streamconv IS_COMPONENT=1 diff --git a/mozilla/netwerk/test/makefile.win b/mozilla/netwerk/test/makefile.win index 3bc6550e417..7907b9eef36 100644 --- a/mozilla/netwerk/test/makefile.win +++ b/mozilla/netwerk/test/makefile.win @@ -17,12 +17,6 @@ DEPTH=..\.. -// temporary, until we land: -!ifndef NECKO -include <$(DEPTH)/config/config.mak> -PUBLIC = $(DEPTH)\netwerk\dist\include -!endif - MAKE_OBJ_TYPE = EXE PROG1 = .\$(OBJDIR)\TestFileInput.exe PROG2 = .\$(OBJDIR)\TestSocketInput.exe diff --git a/mozilla/netwerk/util/public/makefile.win b/mozilla/netwerk/util/public/makefile.win index aa014dfcd01..078888d3aa7 100644 --- a/mozilla/netwerk/util/public/makefile.win +++ b/mozilla/netwerk/util/public/makefile.win @@ -20,11 +20,6 @@ MODULE = necko DEPTH = ..\..\.. include <$(DEPTH)/config/config.mak> -// temporary, until we land: -!ifndef NECKO -PUBLIC = $(DEPTH)\netwerk\dist\include -!endif - EXPORTS = \ nsNeckoUtil.h \ nsIUnicharStreamLoader.h \ diff --git a/mozilla/netwerk/util/src/makefile.win b/mozilla/netwerk/util/src/makefile.win index db480db3894..5812ed55b89 100644 --- a/mozilla/netwerk/util/src/makefile.win +++ b/mozilla/netwerk/util/src/makefile.win @@ -18,11 +18,6 @@ MODULE = necko DEPTH = ..\..\.. include <$(DEPTH)/config/config.mak> -// temporary, until we land: -!ifndef NECKO -PUBLIC = $(DEPTH)\netwerk\dist\include -!endif - LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET LIBRARY_NAME=neckoutil_s