From 59fa95133fed3adb700544ef86f7338508f4d53c Mon Sep 17 00:00:00 2001
From: "jband%netscape.com" <jband%netscape.com>
Date: Tue, 23 Mar 1999 20:30:06 +0000
Subject: [PATCH] getting those Unix Makefiles working again

---
 js/src/xpconnect/Makefile.in        | 26 +++++++++++++++++++++
 js/src/xpconnect/makefile.win       |  1 +
 js/src/xpconnect/public/Makefile.in | 36 +++++++++++++++++++++++++++++
 js/src/xpconnect/src/Makefile.in    | 18 +--------------
 js/src/xpconnect/tests/.cvsignore   |  1 +
 5 files changed, 65 insertions(+), 17 deletions(-)
 create mode 100644 js/src/xpconnect/Makefile.in
 create mode 100644 js/src/xpconnect/public/Makefile.in

diff --git a/js/src/xpconnect/Makefile.in b/js/src/xpconnect/Makefile.in
new file mode 100644
index 000000000000..c74fff716881
--- /dev/null
+++ b/js/src/xpconnect/Makefile.in
@@ -0,0 +1,26 @@
+#!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
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH	= ../../..
+topsrcdir	= @top_srcdir@
+VPATH		= @srcdir@
+srcdir		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS = public src tests
+
+include $(topsrcdir)/config/rules.mk
diff --git a/js/src/xpconnect/makefile.win b/js/src/xpconnect/makefile.win
index 7888e8b8312e..7ad27ab0c8c9 100644
--- a/js/src/xpconnect/makefile.win
+++ b/js/src/xpconnect/makefile.win
@@ -16,6 +16,7 @@
 
 DEPTH=..\..\..
 IGNORE_MANIFEST=1
+
 DIRS=public src tests
 
 include <$(DEPTH)\config\rules.mak>
diff --git a/js/src/xpconnect/public/Makefile.in b/js/src/xpconnect/public/Makefile.in
new file mode 100644
index 000000000000..4affc453ea3c
--- /dev/null
+++ b/js/src/xpconnect/public/Makefile.in
@@ -0,0 +1,36 @@
+#!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
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= xpconnect
+
+EXPORTS = \
+    nsIXPConnect.h      \
+    nsIXPCScriptable.h  \
+    xpccomponents.h     \
+    xpcjsid.h           \
+    xpclog.h            \
+    $(NULL)
+
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
+
+include $(topsrcdir)/config/rules.mk
diff --git a/js/src/xpconnect/src/Makefile.in b/js/src/xpconnect/src/Makefile.in
index c98b873df4e6..3eec57866214 100644
--- a/js/src/xpconnect/src/Makefile.in
+++ b/js/src/xpconnect/src/Makefile.in
@@ -16,7 +16,7 @@
 # Reserved.
 #
 
-DEPTH=../../..
+DEPTH=../../../..
 
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
@@ -26,8 +26,6 @@ include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/config.mk
 
-# DIRS = md
-
 LIBRARY_NAME=xpconnect
 MODULE=xpconnect
 
@@ -51,19 +49,5 @@ CPPSRCS=		\
 	xpcwrappednativeclass.cpp	\
 	$(NULL)
 
-EXPORTS	= \
-    nsIXPCScriptable.h \
-    nsIXPConnect.h     \
-    xpccomponents.h     \
-    xpcjsid.h     \
-    xpclog.h     \
-    xpctest.h     \
-	$(NULL)
-
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES	+= -I$(srcdir)
-
-# MD_LIBRARY	=	md/unix/libxpcmd.a
diff --git a/js/src/xpconnect/tests/.cvsignore b/js/src/xpconnect/tests/.cvsignore
index cf6bdb64fdf8..738f8349e9e6 100644
--- a/js/src/xpconnect/tests/.cvsignore
+++ b/js/src/xpconnect/tests/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 mk.bat
 TestXPC
+vc60.pdb