More XPCOM Glue changes and fixes. Makefile change which can land since 154319 is fixed. r=waterson, sr=rpotts. bug 154319

This commit is contained in:
dougt%netscape.com 2002-07-01 22:22:06 +00:00
Родитель bd1327f962
Коммит 969c4c4049
1 изменённых файлов: 2 добавлений и 3 удалений

Просмотреть файл

@ -63,17 +63,16 @@ EXTRA_COMPONENTS = nsSample.js
# seperate libraries linked in. # seperate libraries linked in.
EXTRA_DSO_LDOPTS = \ EXTRA_DSO_LDOPTS = \
$(DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)string_s.$(LIB_SUFFIX) \ $(DIST)/lib/$(LIB_PREFIX)string_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)string_obsolete_s.$(LIB_SUFFIX) \ $(DIST)/lib/$(LIB_PREFIX)string_obsolete_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX) \
$(NSPR_LIBS) \ $(NSPR_LIBS) \
$(NULL) $(NULL)
LIBS = \ LIBS = \
$(DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)string_s.$(LIB_SUFFIX) \ $(DIST)/lib/$(LIB_PREFIX)string_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)string_obsolete_s.$(LIB_SUFFIX) \ $(DIST)/lib/$(LIB_PREFIX)string_obsolete_s.$(LIB_SUFFIX) \
$(XPCOM_LIBS) \ $(DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX) \
$(NSPR_LIBS) \ $(NSPR_LIBS) \
$(NULL) $(NULL)