Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libmocha depends upon libi18n so change the link order.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@13345 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cls%seawood.org
1998-10-22 22:59:12 +00:00
parent a6807f0b9a
commit f888cfd66a
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/cmd/xfe/Makefile
View File

@@ -339,7 +339,6 @@ BASIC_LIBS += \
$(DIST)/lib/libhook.a \
$(DIST)/lib/libparse.a \
$(DIST)/lib/lib$(LITE_PREFIX)pref.a \
$(DIST)/lib/lib$(LITE_PREFIX)i18n.a \
$(DIST)/lib/libpics.a \
$(DIST)/lib/libpwcac.a \
$(DIST)/lib/libreg.a \
@@ -555,19 +554,20 @@ BASIC_DSOS += \
$(XFE_JPEG_DSO) \
$(NULL)
ifndef NO_MOCHA
# XXX To a DSO...
ifdef FULL_STATIC_BUILD
BASIC_LIBS += $(DIST)/lib/libjs.a $(DIST)/lib/libjsj.a
else
BASIC_DSOS += -ljs -ljsj
endif
BASIC_LIBS += $(DIST)/lib/libmocha.a
BASIC_LIBS += $(DIST)/lib/libmocha.a \
$(DIST)/lib/lib$(LITE_PREFIX)i18n.a
ifdef DOM
# the DOM code calls back into layout.
BASIC_LIBS += $(DIST)/lib/liblay.a
endif
endif
ifdef DOM
BASIC_LIBS += $(DIST)/lib/libdom.a

8
mozilla/cmd/xfe/Makefile.in
View File

@@ -341,7 +341,6 @@ BASIC_LIBS += \
$(DIST)/lib/libhook.a \
$(DIST)/lib/libparse.a \
$(DIST)/lib/lib$(LITE_PREFIX)pref.a \
$(DIST)/lib/lib$(LITE_PREFIX)i18n.a \
$(DIST)/lib/libpics.a \
$(DIST)/lib/libpwcac.a \
$(DIST)/lib/libreg.a \
@@ -557,7 +556,6 @@ BASIC_DSOS += \
$(XFE_JPEG_DSO) \
$(NULL)
ifndef NO_MOCHA
# XXX To a DSO...
ifdef FULL_STATIC_BUILD
BASIC_LIBS += $(DIST)/lib/libjs.a
@@ -570,12 +568,14 @@ ifdef JAVA_OR_OJI
BASIC_DSOS += -ljsj
endif
endif
BASIC_LIBS += $(DIST)/lib/libmocha.a
BASIC_LIBS += $(DIST)/lib/libmocha.a \
$(DIST)/lib/lib$(LITE_PREFIX)i18n.a
ifdef DOM
# the DOM code calls back into layout.
BASIC_LIBS += $(DIST)/lib/liblay.a
endif
endif
ifdef DOM
BASIC_LIBS += $(DIST)/lib/libdom.a