Bug 236101 - flatten the directory structure of the embedding SDK. Consensus from dougt/adamlock/blizzard r=cls a=mkaply

git-svn-id: svn://10.0.0.236/trunk@154206 18797224-902f-48f8-a5cc-f745e15eee43
2004-03-23 20:58:21 +00:00
parent 3505b21157
commit 325368273d
8 changed files with 30 additions and 18 deletions
--- a/mozilla/xpcom/build/Makefile.in
+++ b/mozilla/xpcom/build/Makefile.in
@@ -98,7 +98,8 @@ SDK_HEADERS =  \
 		nsXPCOMCID.h    \
 		$(NULL)

-SDK_BINARY = $(IMPORT_LIBRARY) $(SHARED_LIBRARY)
+SDK_LIBRARY = $(IMPORT_LIBRARY)
+SDK_BINARY = $(SHARED_LIBRARY)

 # pull in MoreFiles for MacOSX
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
--- a/mozilla/xpcom/glue/Makefile.in
+++ b/mozilla/xpcom/glue/Makefile.in
@@ -51,7 +51,7 @@ SDK_HEADERS     = \
 		$(XPCOM_GLUE_SRC_LEXPORTS) \
 		$(NULL)

-SDK_BINARY     =                        \
+SDK_LIBRARY     =                        \
 		$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
 		$(NULL)

--- a/mozilla/xpcom/glue/standalone/Makefile.in
+++ b/mozilla/xpcom/glue/standalone/Makefile.in
@@ -62,7 +62,7 @@ SDK_HEADERS     = \
 		nsXPCOMGlue.h \
 		$(NULL)

-SDK_BINARY     	= \
+SDK_LIBRARY     	= \
 		$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX) \
 		$(NULL)