зеркало из https://github.com/mozilla/gecko-dev.git
Moved NSPR libraries into $(NSPR_LIBS). Changed link commands to use $(NSPR_LDFLAGS) $(NSPR_LIBS).
This commit is contained in:
cls%seawood.org
Родитель
f82680e176
Коммит
a936506e81
|
|
@ -231,7 +231,6 @@ MCS_CMD = true
|
|||
# Only IRIX 5.x uses this.
|
||||
EXTRA_POST_LINK_CMD = echo
|
||||
|
||||
NSPR_LIB = $(DIST)/lib/libplds21.a $(DIST)/lib/libplc21.a $(DIST)/lib/libnspr21.a
|
||||
BASIC_LIBS = \
|
||||
$(DIST)/lib/libgnuzilla.a \
|
||||
$(DIST)/lib/libgnuzilla-widgets.a \
|
||||
|
|
@ -413,14 +412,14 @@ endif
|
|||
|
||||
BASIC_LIBS += $(DIST)/lib/libhtmldlgs.a $(DIST)/lib/libsecfree.a
|
||||
|
||||
EXPORT_LDFLAGS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(OTHER_LIBS) $(NSPR_LIB)
|
||||
EXPORT_DEPLIBS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIB)
|
||||
EXPORT_LDFLAGS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(OTHER_LIBS) $(NSPR_LIBS)
|
||||
EXPORT_DEPLIBS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIBS)
|
||||
|
||||
FRANCE_LDFLAGS = $(BASIC_LIBS) $(FRANCE_LIB) $(BASIC_LIBS_2) $(OTHER_LIBS) $(NSPR_LIB)
|
||||
FRANCE_DEPLIBS = $(BASIC_LIBS) $(FRANCE_LIB) $(BASIC_LIBS_2) $(NSPR_LIB)
|
||||
FRANCE_LDFLAGS = $(BASIC_LIBS) $(FRANCE_LIB) $(BASIC_LIBS_2) $(OTHER_LIBS) $(NSPR_LIBS)
|
||||
FRANCE_DEPLIBS = $(BASIC_LIBS) $(FRANCE_LIB) $(BASIC_LIBS_2) $(NSPR_LIBS)
|
||||
|
||||
US_LDFLAGS = $(BASIC_LIBS) $(US_LIB) $(BASIC_LIBS_2) $(OTHER_LIBS) $(NSPR_LIB)
|
||||
US_DEPLIBS = $(BASIC_LIBS) $(US_LIB) $(BASIC_LIBS_2) $(NSPR_LIB)
|
||||
US_LDFLAGS = $(BASIC_LIBS) $(US_LIB) $(BASIC_LIBS_2) $(OTHER_LIBS) $(NSPR_LIBS)
|
||||
US_DEPLIBS = $(BASIC_LIBS) $(US_LIB) $(BASIC_LIBS_2) $(NSPR_LIBS)
|
||||
|
||||
DSO_EX_LIBS = $(EXPORT_LDFLAGS:$(DIST)/lib/lib%.a=-l%)
|
||||
DSO_EX_LIBS = $(FRANCE_LDFLAGS:$(DIST)/lib/lib%.a=-l%)
|
||||
|
|
@ -592,9 +591,9 @@ ifeq ($(OS_ARCH),OSF1)
|
|||
|
||||
OTHER_LIBS = -ldnet_stubs -lm -lots $(OS_LIBS)
|
||||
|
||||
EXPORT_LDFLAGS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIB) $(OTHER_LIBS)
|
||||
FRANCE_LDFLAGS = $(BASIC_LIBS) $(FRANCE_LIB) $(BASIC_LIBS_2) $(NSPR_LIB) $(OTHER_LIBS)
|
||||
US_LDFLAGS = $(BASIC_LIBS) $(US_LIB) $(BASIC_LIBS_2) $(NSPR_LIB) $(OTHER_LIBS)
|
||||
EXPORT_LDFLAGS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIBS) $(OTHER_LIBS)
|
||||
FRANCE_LDFLAGS = $(BASIC_LIBS) $(FRANCE_LIB) $(BASIC_LIBS_2) $(NSPR_LIBS) $(OTHER_LIBS)
|
||||
US_LDFLAGS = $(BASIC_LIBS) $(US_LIB) $(BASIC_LIBS_2) $(NSPR_LIBS) $(OTHER_LIBS)
|
||||
|
||||
ifdef MOZ_EDITOR
|
||||
#
|
||||
|
|
@ -715,13 +714,13 @@ endif
|
|||
|
||||
US_LDFLAGS = -z defs -L$(USRLIBDIR) \
|
||||
-R$(USRLIBDIR) $(BASIC_LIBS) $(US_LIB) $(BASIC_LIBS_2) \
|
||||
$(OTHER_LIBS) $(NSPR_LIB)
|
||||
$(OTHER_LIBS) $(NSPR_LIBS)
|
||||
EXPORT_LDFLAGS = -z defs -L$(USRLIBDIR) \
|
||||
-R$(USRLIBDIR) $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) \
|
||||
$(OTHER_LIBS) $(NSPR_LIB)
|
||||
$(OTHER_LIBS) $(NSPR_LIBS)
|
||||
FRANCE_LDFLAGS = -z defs -L$(USRLIBDIR) \
|
||||
-R$(USRLIBDIR) $(BASIC_LIBS) $(FRANCE_LIB) $(BASIC_LIBS_2) \
|
||||
$(OTHER_LIBS) $(NSPR_LIB)
|
||||
$(OTHER_LIBS) $(NSPR_LIBS)
|
||||
|
||||
endif
|
||||
|
||||
|
|
@ -1216,10 +1215,10 @@ pure: $(OBJDIR)/$(XFE_PROGNAME)-export $(OBJDIR)/$(XFE_PROGNAME)-export.pure
|
|||
quantify: $(OBJDIR)/$(XFE_PROGNAME)-export $(OBJDIR)/$(XFE_PROGNAME)-export.quantify
|
||||
|
||||
# Use gtscc to find dead code globals.
|
||||
unreferenced: $(OBJS) $(NET_EXPORT_OBJS) $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIB) $(DIST)/bin/gtscc
|
||||
unreferenced: $(OBJS) $(NET_EXPORT_OBJS) $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIBS) $(DIST)/bin/gtscc
|
||||
@$(MAKE_OBJDIR)
|
||||
rm -f $@
|
||||
$(DIST)/bin/gtscc -gtsrootdir $(DEPTH) -gtsdump -gtsnorecompile -gtsnolink $(DEPTH) $(OBJS) $(NET_EXPORT_OBJS) $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIB) | awk -n '/ 0 0 / { print $$5 " " $$1 }' | sort > $@
|
||||
$(DIST)/bin/gtscc -gtsrootdir $(DEPTH) -gtsdump -gtsnorecompile -gtsnolink $(DEPTH) $(OBJS) $(NET_EXPORT_OBJS) $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIBS) | awk -n '/ 0 0 / { print $$5 " " $$1 }' | sort > $@
|
||||
|
||||
# Some dependencies that -MDupdate isn't getting.
|
||||
$(OBJDIR)/strids.o: xfe_err.h
|
||||
|
|
|
|||
|
|
@ -229,13 +229,11 @@ GARBAGE += $(MOCSRCS) $(XFEPRIVDIR)/Netscape.mk $(OBJDIR)/icon-pixmaps.inc $(OB
|
|||
#ICONS_LIB = $(DIST)/lib/lib$(LITE_PREFIX)xfeicons.a
|
||||
|
||||
ifeq ($(OS_ARCH),AIX)
|
||||
NSPR_LIB =
|
||||
else
|
||||
NSPR_LIB = $(DIST)/lib/libplds21.a $(DIST)/lib/libplc21.a $(DIST)/lib/libnspr21.a
|
||||
NSPR_LIBS =
|
||||
endif
|
||||
|
||||
ifdef DBMALLOC
|
||||
NSPR_LIB += $(DIST)/lib/libdbmalloc.a
|
||||
NSPR_LIBS += $(DIST)/lib/libdbmalloc.a
|
||||
endif
|
||||
|
||||
ifndef DISABLE_MARINER
|
||||
|
|
@ -509,7 +507,7 @@ endif
|
|||
|
||||
LOCALES = $(LOCALE_MAP) $(MAIL_IM_HACK) $(NEWS_IM_HACK)
|
||||
|
||||
ALL_EXPORT_LIBS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIB)
|
||||
ALL_EXPORT_LIBS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIBS)
|
||||
|
||||
ALL_EXPORT_DSOS = $(ALL_EXPORT_LIBS:$(DIST)/lib/lib%.a=-l%)
|
||||
PLUGIN_DSO = $(DIST)/bin/libnullplugin.so
|
||||
|
|
@ -602,8 +600,8 @@ MCS_CMD = true
|
|||
# Only IRIX 5.x uses this.
|
||||
EXTRA_POST_LINK_CMD = echo
|
||||
|
||||
EXPORT_LDFLAGS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(OTHER_LIBS) $(NSPR_LIB)
|
||||
EXPORT_DEPLIBS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIB)
|
||||
EXPORT_LDFLAGS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(OTHER_LIBS) $(NSPR_LIBS)
|
||||
EXPORT_DEPLIBS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIBS)
|
||||
|
||||
DSO_EX_LIBS = $(EXPORT_LDFLAGS:$(DIST)/lib/lib%.a=-l%)
|
||||
|
||||
|
|
@ -768,7 +766,7 @@ ifeq ($(OS_ARCH),OSF1)
|
|||
#
|
||||
OTHER_LIBS = $(QTLIB) -lX11 -lXext -ldnet_stub -lm -lots $(OS_LIBS)
|
||||
|
||||
EXPORT_LDFLAGS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIB) $(OTHER_LIBS)
|
||||
EXPORT_LDFLAGS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIBS) $(OTHER_LIBS)
|
||||
|
||||
endif
|
||||
|
||||
|
|
@ -857,7 +855,7 @@ endif
|
|||
|
||||
EXPORT_LDFLAGS = -z defs -L$(MOTIF)/lib -L$(USRLIBDIR) -R$(MOTIF)/lib \
|
||||
-R$(USRLIBDIR) $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) \
|
||||
$(OTHER_LIBS) $(NSPR_LIB)
|
||||
$(OTHER_LIBS) $(NSPR_LIBS)
|
||||
|
||||
endif
|
||||
endif
|
||||
|
|
@ -1019,10 +1017,10 @@ pure: $(OBJDIR)/$(QTFE_PROGNAME)-export $(OBJDIR)/$(QTFE_PROGNAME)-export.pure
|
|||
quantify: $(OBJDIR)/$(QTFE_PROGNAME)-export $(OBJDIR)/$(QTFE_PROGNAME)-export.quantify
|
||||
|
||||
# Use gtscc to find dead code globals.
|
||||
unreferenced: $(OBJS) $(NET_EXPORT_OBJS) $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIB) $(DIST)/bin/gtscc
|
||||
unreferenced: $(OBJS) $(NET_EXPORT_OBJS) $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIBS) $(DIST)/bin/gtscc
|
||||
@$(MAKE_OBJDIR)
|
||||
rm -f $@
|
||||
$(DIST)/bin/gtscc -gtsrootdir $(DEPTH) -gtsdump -gtsnorecompile -gtsnolink $(DEPTH) $(OBJS) $(NET_EXPORT_OBJS) $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIB) | awk -n '/ 0 0 / { print $$5 " " $$1 }' | sort > $@
|
||||
$(DIST)/bin/gtscc -gtsrootdir $(DEPTH) -gtsdump -gtsnorecompile -gtsnolink $(DEPTH) $(OBJS) $(NET_EXPORT_OBJS) $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIBS) | awk -n '/ 0 0 / { print $$5 " " $$1 }' | sort > $@
|
||||
|
||||
ifeq ($(OS_ARCH),AIX)
|
||||
AIX_HACK := $(notdir $(AIX_NSPR))
|
||||
|
|
|
|||
|
|
@ -90,12 +90,8 @@ NOMD_LDFLAGS = $(NOMD_CFLAGS)
|
|||
|
||||
OBJS = $(CSRCS:.c=.o) $(CPPSRCS:.cc=.o)
|
||||
|
||||
NSPR_LIB = $(DIST)/lib/libplds21.a \
|
||||
$(DIST)/lib/libplc21.a \
|
||||
$(DIST)/lib/libnspr21.a
|
||||
|
||||
ifdef DBMALLOC
|
||||
NSPR_LIB += $(DIST)/lib/libdbmalloc.a
|
||||
NSPR_LIBS += $(DIST)/lib/libdbmalloc.a
|
||||
endif
|
||||
|
||||
CFLAGS += -DENABLE_MARINER
|
||||
|
|
@ -417,8 +413,8 @@ MCS_CMD = true
|
|||
# Only IRIX 5.x uses this.
|
||||
EXTRA_POST_LINK_CMD = echo
|
||||
|
||||
EXPORT_LDFLAGS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(OTHER_LIBS) $(NSPR_LIB)
|
||||
EXPORT_DEPLIBS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIB)
|
||||
EXPORT_LDFLAGS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(OTHER_LIBS) $(NSPR_LIBS)
|
||||
EXPORT_DEPLIBS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIBS)
|
||||
|
||||
|
||||
DSO_EX_LIBS = $(EXPORT_LDFLAGS:$(DIST)/lib/lib%.a=-l%)
|
||||
|
|
@ -576,9 +572,9 @@ ifeq ($(OS_ARCH),OSF1)
|
|||
|
||||
OTHER_LIBS = -ldnet_stub -lm -lots $(OS_LIBS)
|
||||
|
||||
EXPORT_LDFLAGS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIB) $(OTHER_LIBS)
|
||||
FRANCE_LDFLAGS = $(BASIC_LIBS) $(FRANCE_LIB) $(BASIC_LIBS_2) $(NSPR_LIB) $(OTHER_LIBS)
|
||||
US_LDFLAGS = $(BASIC_LIBS) $(US_LIB) $(BASIC_LIBS_2) $(NSPR_LIB) $(OTHER_LIBS)
|
||||
EXPORT_LDFLAGS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIBS) $(OTHER_LIBS)
|
||||
FRANCE_LDFLAGS = $(BASIC_LIBS) $(FRANCE_LIB) $(BASIC_LIBS_2) $(NSPR_LIBS) $(OTHER_LIBS)
|
||||
US_LDFLAGS = $(BASIC_LIBS) $(US_LIB) $(BASIC_LIBS_2) $(NSPR_LIBS) $(OTHER_LIBS)
|
||||
|
||||
ifdef MOZ_EDITOR
|
||||
#
|
||||
|
|
@ -693,13 +689,13 @@ OTHER_LIBS += -L/usr/dt/lib -lXm
|
|||
|
||||
US_LDFLAGS = -z defs -L$(USRLIBDIR) \
|
||||
-R$(USRLIBDIR) $(BASIC_LIBS) $(US_LIB) $(BASIC_LIBS_2) \
|
||||
$(OTHER_LIBS) $(NSPR_LIB)
|
||||
$(OTHER_LIBS) $(NSPR_LIBS)
|
||||
EXPORT_LDFLAGS = -z defs -L$(USRLIBDIR) \
|
||||
-R$(USRLIBDIR) $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) \
|
||||
$(OTHER_LIBS) $(NSPR_LIB)
|
||||
$(OTHER_LIBS) $(NSPR_LIBS)
|
||||
FRANCE_LDFLAGS = -z defs -L$(USRLIBDIR) \
|
||||
-R$(USRLIBDIR) $(BASIC_LIBS) $(FRANCE_LIB) $(BASIC_LIBS_2) \
|
||||
$(OTHER_LIBS) $(NSPR_LIB)
|
||||
$(OTHER_LIBS) $(NSPR_LIBS)
|
||||
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -272,18 +272,16 @@ DYNAMIC_SYMBOLS_F =
|
|||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),AIX)
|
||||
NSPR_LIB =
|
||||
NSPR_LIBS =
|
||||
else
|
||||
# XXX To a DSO...
|
||||
ifdef FULL_STATIC_BUILD
|
||||
NSPR_LIB = $(DIST)/lib/libplds21.a $(DIST)/lib/libplc21.a $(DIST)/lib/libnspr21.a
|
||||
else
|
||||
BASIC_DSOS += -lplds21 -lplc21 -lnspr21
|
||||
ifndef FULL_STATIC_BUILD
|
||||
NSPR_LIBS =
|
||||
BASIC_DSOS += $(NSPR_DIR)/lib/libplds21.so $(NSPR_DIR)/lib/libplc21.so $(NSPR_DIR)/lib/libnspr21.so
|
||||
endif
|
||||
endif
|
||||
|
||||
ifdef DBMALLOC
|
||||
NSPR_LIB += $(DIST)/lib/libdbmalloc.a
|
||||
NSPR_LIBS += $(DIST)/lib/libdbmalloc.a
|
||||
endif
|
||||
|
||||
XFE2_DIR = src
|
||||
|
|
@ -597,7 +595,7 @@ endif
|
|||
|
||||
LOCALES = $(LOCALE_MAP) $(MAIL_IM_HACK) $(NEWS_IM_HACK)
|
||||
|
||||
ALL_EXPORT_LIBS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIB)
|
||||
ALL_EXPORT_LIBS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIBS)
|
||||
|
||||
ALL_EXPORT_DSOS = $(ALL_EXPORT_LIBS:$(DIST)/lib/lib%.a=-l%)
|
||||
PLUGIN_DSO = $(DIST)/bin/libnullplugin.so
|
||||
|
|
@ -719,7 +717,8 @@ EXPORT_LDFLAGS =\
|
|||
$(EXPORT_LIB) \
|
||||
$(BASIC_LIBS_2) \
|
||||
$(BASIC_DSOS) \
|
||||
$(NSPR_LIB) \
|
||||
$(NSPR_LDFLAGS) \
|
||||
$(NSPR_LIBS) \
|
||||
$(OTHER_LIBS)
|
||||
|
||||
EXPORT_DYN_MOTIF_LDFLAGS =\
|
||||
|
|
@ -727,14 +726,14 @@ EXPORT_DYN_MOTIF_LDFLAGS =\
|
|||
$(EXPORT_LIB) \
|
||||
$(BASIC_LIBS_2) \
|
||||
$(BASIC_DSOS) \
|
||||
$(NSPR_LIB) \
|
||||
$(NSPR_LDFLAGS) \
|
||||
$(NSPR_LIBS) \
|
||||
$(OTHER_DYN_MOTIF_LIBS)
|
||||
|
||||
EXPORT_DEPLIBS =\
|
||||
$(BASIC_LIBS) \
|
||||
$(EXPORT_LIB) \
|
||||
$(BASIC_LIBS_2) \
|
||||
$(NSPR_LIB)
|
||||
$(BASIC_LIBS_2)
|
||||
|
||||
DSO_EX_LIBS = $(EXPORT_LDFLAGS:$(DIST)/lib/lib%.a=-l%)
|
||||
|
||||
|
|
@ -1077,7 +1076,7 @@ endif
|
|||
|
||||
EXPORT_LDFLAGS = -z defs -L$(MOTIF)/lib -L$(USRLIBDIR) -R$(MOTIF)/lib \
|
||||
-R$(USRLIBDIR) $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) \
|
||||
$(BASIC_DSOS) $(NSPR_LIB) $(OTHER_LIBS)
|
||||
$(BASIC_DSOS) $(NSPR_LDFLAGS) $(NSPR_LIBS) $(OTHER_LIBS)
|
||||
|
||||
endif
|
||||
endif
|
||||
|
|
@ -1302,10 +1301,10 @@ pure: $(OBJDIR)/$(XFE_PROGNAME)-export $(OBJDIR)/$(XFE_PROGNAME)-export.pure
|
|||
quantify: $(OBJDIR)/$(XFE_PROGNAME)-export $(OBJDIR)/$(XFE_PROGNAME)-export.quantify
|
||||
|
||||
# Use gtscc to find dead code globals.
|
||||
unreferenced: $(OBJS) $(NET_EXPORT_OBJS) $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIB) $(DIST)/bin/gtscc
|
||||
unreferenced: $(OBJS) $(NET_EXPORT_OBJS) $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIBS) $(DIST)/bin/gtscc
|
||||
@$(MAKE_OBJDIR)
|
||||
rm -f $@
|
||||
$(DIST)/bin/gtscc -gtsrootdir $(DEPTH) -gtsdump -gtsnorecompile -gtsnolink $(DEPTH) $(OBJS) $(NET_EXPORT_OBJS) $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIB) | awk -n '/ 0 0 / { print $$5 " " $$1 }' | sort > $@
|
||||
$(DIST)/bin/gtscc -gtsrootdir $(DEPTH) -gtsdump -gtsnorecompile -gtsnolink $(DEPTH) $(OBJS) $(NET_EXPORT_OBJS) $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIBS) | awk -n '/ 0 0 / { print $$5 " " $$1 }' | sort > $@
|
||||
|
||||
# Some dependencies that -MDupdate isn't getting.
|
||||
$(OBJDIR)/strids.o: xfe_err.h
|
||||
|
|
|
|||
|
|
@ -150,14 +150,12 @@ ifndef NSPR20
|
|||
MKICONS_LIB = \
|
||||
$(DIST)/lib/libimg.a \
|
||||
$(JAVA_JMC) \
|
||||
$(DIST)/lib/libnspr.a \
|
||||
$(DIST)/lib/libutil.a \
|
||||
$(DIST)/lib/libxp.a
|
||||
else
|
||||
MKICONS_LIB = \
|
||||
$(DIST)/lib/libimg.a \
|
||||
$(JAVA_JMC) \
|
||||
$(DIST)/lib/libnspr21.a \
|
||||
$(DIST)/lib/libutil.a \
|
||||
$(DIST)/lib/libxp.a \
|
||||
$(DIST)/lib/libplc21.a \
|
||||
|
|
@ -182,7 +180,7 @@ else
|
|||
MKICONS_LIB += $(DIST)/lib/libzlib.a
|
||||
endif
|
||||
|
||||
MKICONS_EXTRA = $(OS_LIBS) -lm
|
||||
MKICONS_EXTRA = $(NSPR_LDFLAGS) $(NSPR_LIBS) $(OS_LIBS) -lm
|
||||
|
||||
#######################################################################
|
||||
# Rules to build mkicons program and then icondata.c
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ DEFINES += -DNO_SECURITY
|
|||
# writes HTML to stdout
|
||||
|
||||
FILT_LIBS=-L$(DIST)/lib -L$(DIST)/bin -li18n -lnetwork -lxp \
|
||||
-lnspr21 -lplc21 -lplds21
|
||||
$(NSPR_LDFLAGS) $(NSPR_LIBS)
|
||||
|
||||
$(OBJDIR)/mimefilt: $(FILT_OBJS) $(LIBRARY)
|
||||
@$(MAKE_OBJDIR)
|
||||
|
|
|
|||
|
|
@ -47,8 +47,7 @@ TEST_LIBS = $(LIBRARY) \
|
|||
$(DIST)/lib/liburl.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libsec-us.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libdbm.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libxp.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/nspr.$(LIB_SUFFIX)
|
||||
$(DIST)/lib/libxp.$(LIB_SUFFIX)
|
||||
|
||||
CSS_TEST_LIBS = $(LIBRARY) \
|
||||
$(DIST)/lib/libxp.$(LIB_SUFFIX)
|
||||
|
|
@ -62,8 +61,8 @@ endif
|
|||
|
||||
ifdef ENABLE_TESTS
|
||||
test:
|
||||
$(CC) -g -o $(OBJDIR)/style_test $(CFLAGS) -DSS_TEST stystruc.c $(TEST_LIBS)
|
||||
$(CC) -g -o $(OBJDIR)/stack_test $(CFLAGS) -DTEST_STYLESTACK stystack.c $(TEST_LIBS)
|
||||
$(CC) -g -o $(OBJDIR)/style_test $(CFLAGS) -DSS_TEST stystruc.c $(TEST_LIBS) $(NSPR_LDFLAGS) $(NSPR_LIBS)
|
||||
$(CC) -g -o $(OBJDIR)/stack_test $(CFLAGS) -DTEST_STYLESTACK stystack.c $(TEST_LIBS) $(NSPR_LDFLAGS) $(NSPR_LIBS)
|
||||
|
||||
css_test:
|
||||
rm -f $(OBJDIR)/css_test
|
||||
|
|
|
|||
|
|
@ -104,8 +104,8 @@ $(SDK_TARGET):: $(PRODUCER_SDK_FILES)
|
|||
$(NSINSTALL) -m 0444 $(PUBLIC)/java/jritypes.h $(SDK_DIR)/$(SDK_NAME)/include
|
||||
$(NSINSTALL) -m 0444 $(PUBLIC)/java/jri_md.h $(SDK_DIR)/$(SDK_NAME)/include
|
||||
$(NSINSTALL) -m 0444 $(PUBLIC)/java/jri.h $(SDK_DIR)/$(SDK_NAME)/include
|
||||
$(NSINSTALL) -m 0444 $(PUBLIC)/nspr/prtypes.h $(SDK_DIR)/$(SDK_NAME)/include
|
||||
$(NSINSTALL) -m 0444 $(PUBLIC)/nspr/prcpucfg.h $(SDK_DIR)/$(SDK_NAME)/include
|
||||
$(NSINSTALL) -m 0444 $(NSPR_DIR)/include/prtypes.h $(SDK_DIR)/$(SDK_NAME)/include
|
||||
$(NSINSTALL) -m 0444 $(NSPR_DIR)/include/prcpucfg.h $(SDK_DIR)/$(SDK_NAME)/include
|
||||
$(NSINSTALL) -m 0664 cfp.c crf.c $(SDK_DIR)/$(SDK_NAME)/src
|
||||
$(NSINSTALL) -m 0444 $(JMC_GEN_DIR)/Mcfp.c $(JMC_GEN_DIR)/Mcrf.c $(SDK_DIR)/$(SDK_NAME)/src
|
||||
$(NSINSTALL) -m 0444 ../sdk/unix/makefile.sgi $(SDK_DIR)/$(SDK_NAME)/unix
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче