зеркало из https://github.com/mozilla/pjs.git
Removed redundant XPDIST from the build. Changed existing references to DIST.
Replaced all uses of $(DIST)/include with $(PUBLIC) except those looking for NSPR headers. Removed extra instances of $(DIST)/include or $(PUBLIC) from INCLUDES as it's already there. Override OS_LIBS when setting host variables for cross-compiling.
This commit is contained in:
cls%seawood.org
Родитель
730655a8de
Коммит
9f3b874745
|
|
@ -105,7 +105,7 @@ JAVAH = $(JAVAH_PROG) $(JAVAH_FLAGS)
|
|||
######################################################################
|
||||
# jmc
|
||||
|
||||
JMCSRCDIR = $(XPDIST)/_jmc
|
||||
JMCSRCDIR = $(DIST)/_jmc
|
||||
JMC_PROG = $(JAVA) netscape.tools.jmc.Main
|
||||
JMC_CLASSPATH = $(JMCSRCDIR)$(PATH_SEPARATOR)$(JAVAC_CLASSPATH)
|
||||
JMC_FLAGS = -classpath $(JMC_CLASSPATH) -verbose
|
||||
|
|
|
|||
|
|
@ -254,13 +254,7 @@ JAVA_OPTIMIZER = -g
|
|||
XBCFLAGS = -FR$*
|
||||
endif
|
||||
|
||||
#
|
||||
# XXX For now, we're including $(DEPTH)/include directly instead of
|
||||
# getting this stuff from dist. This stuff is old and will eventually
|
||||
# be put in the library directories where it belongs so that it can
|
||||
# get exported to dist properly.
|
||||
#
|
||||
INCLUDES = $(LOCAL_INCLUDES) -I$(PUBLIC) -I$(DIST)/include -I$(XPDIST)/include -I$(topsrcdir)/include $(OS_INCLUDES)
|
||||
INCLUDES = $(LOCAL_INCLUDES) -I$(PUBLIC) -I$(topsrcdir)/include $(OS_INCLUDES)
|
||||
|
||||
LIBNT = $(DIST)/lib/libnt.$(LIB_SUFFIX)
|
||||
LIBAWT = $(DIST)/lib/libawt.$(LIB_SUFFIX)
|
||||
|
|
@ -309,15 +303,15 @@ endif
|
|||
#
|
||||
# Override defaults
|
||||
|
||||
XPDIST = $(DEPTH)/dist
|
||||
|
||||
# We need to know where to find the libraries we
|
||||
# put on the link line for binaries, and should
|
||||
# we link statically or dynamic? Assuming dynamic for now.
|
||||
LIBS_DIR = -L$(DIST)/bin -L$(DIST)/lib
|
||||
|
||||
# all public include files go in subdirectories of PUBLIC:
|
||||
PUBLIC = $(XPDIST)/include
|
||||
# Default location of include files
|
||||
# Note: NSPR doesn't have $(PUBLIC) and
|
||||
# will always install its headers to $(DIST)/include
|
||||
PUBLIC = $(DIST)/include
|
||||
|
||||
DEPENDENCIES = .md
|
||||
|
||||
|
|
@ -416,7 +410,7 @@ endif
|
|||
######################################################################
|
||||
|
||||
# where the bytecode will go
|
||||
JAVA_DESTPATH = $(XPDIST)/classes
|
||||
JAVA_DESTPATH = $(DIST)/classes
|
||||
|
||||
# where the sources for the module you are compiling are
|
||||
# default is sun-java/classsrc, override for other modules
|
||||
|
|
|
|||
|
|
@ -82,12 +82,13 @@ endif
|
|||
|
||||
ifdef INTERNAL_TOOLS
|
||||
ifdef CROSS_COMPILE
|
||||
CC = $(HOST_CC)
|
||||
CXX = $(HOST_CXX)
|
||||
CFLAGS = $(HOST_CFLAGS) -I$(DIST)/include $(NSPR_CFLAGS)
|
||||
CXXFLAGS = $(HOST_CXXFLAGS) -I$(DIST)/include $(NSPR_CFLAGS)
|
||||
RANLIB = $(HOST_RANLIB)
|
||||
AR = $(HOST_AR)
|
||||
CC := $(HOST_CC)
|
||||
CXX := $(HOST_CXX)
|
||||
CFLAGS := $(HOST_CFLAGS) -I$(PUBLIC) $(NSPR_CFLAGS)
|
||||
CXXFLAGS := $(HOST_CXXFLAGS) -I$(PUBLIC) $(NSPR_CFLAGS)
|
||||
RANLIB := $(HOST_RANLIB)
|
||||
AR := $(HOST_AR)
|
||||
OS_LIBS :=
|
||||
endif
|
||||
endif
|
||||
|
||||
|
|
@ -812,7 +813,7 @@ export:: $(JAVA_DESTPATH) $(JAVA_DESTPATH)/$(PACKAGE)
|
|||
all:: export
|
||||
|
||||
clean clobber::
|
||||
rm -f $(XPDIST)/classes/$(PACKAGE)/*.class
|
||||
rm -f $(DIST)/classes/$(PACKAGE)/*.class
|
||||
|
||||
endif
|
||||
endif
|
||||
|
|
@ -1052,11 +1053,11 @@ export:: FORCE
|
|||
@echo; sleep 2; false
|
||||
endif
|
||||
|
||||
# export .idl files to $(XPDIST)/idl
|
||||
$(XPDIST)/idl::
|
||||
# export .idl files to $(DIST)/idl
|
||||
$(DIST)/idl::
|
||||
@if test ! -d $@; then echo Creating $@; rm -rf $@; $(NSINSTALL) -D $@; else true; fi
|
||||
|
||||
export:: $(XPIDLSRCS) $(XPDIST)/idl
|
||||
export:: $(XPIDLSRCS) $(DIST)/idl
|
||||
$(INSTALL) -m 444 $^
|
||||
|
||||
# generate .h files from into $(XPIDL_GEN_DIR), then export to $(PUBLIC);
|
||||
|
|
@ -1068,7 +1069,7 @@ $(XPIDL_GEN_DIR):
|
|||
# with any addition to the directory, regenerating all .h files -> everything.
|
||||
|
||||
$(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_COMPILE)
|
||||
$(XPIDL_COMPILE) -m header -w -I $(XPDIST)/idl -I$(srcdir) -o $(XPIDL_GEN_DIR)/$* $<
|
||||
$(XPIDL_COMPILE) -m header -w -I $(DIST)/idl -I$(srcdir) -o $(XPIDL_GEN_DIR)/$* $<
|
||||
@if test -n "$(findstring $*.h, $(EXPORTS))"; \
|
||||
then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi
|
||||
|
||||
|
|
@ -1079,7 +1080,7 @@ ifndef NO_GEN_XPT
|
|||
# generate intermediate .xpt files into $(XPIDL_GEN_DIR), then link
|
||||
# into $(XPIDL_MODULE).xpt and export it to $(DIST)/bin/components.
|
||||
$(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_COMPILE)
|
||||
$(XPIDL_COMPILE) -m typelib -w -I $(XPDIST)/idl -I$(srcdir) -o $(XPIDL_GEN_DIR)/$* $<
|
||||
$(XPIDL_COMPILE) -m typelib -w -I $(DIST)/idl -I$(srcdir) -o $(XPIDL_GEN_DIR)/$* $<
|
||||
|
||||
$(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.xpt,$(XPIDLSRCS))
|
||||
$(XPIDL_LINK) $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt $^
|
||||
|
|
|
|||
|
|
@ -57,5 +57,5 @@ include $(topsrcdir)/config/rules.mk
|
|||
|
||||
DEFINES += -D_IMPL_NS_HTML
|
||||
|
||||
INCLUDES += -I$(PUBLIC)/dom -I$(srcdir)/../../html/base/src
|
||||
INCLUDES += -I$(srcdir)/../../html/base/src
|
||||
|
||||
|
|
|
|||
|
|
@ -34,5 +34,3 @@ LIBS = -lxpcom $(NSPR_LIBS)
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
INCLUDES += -I$(DIST)/include
|
||||
|
||||
|
|
|
|||
|
|
@ -45,5 +45,5 @@ LIBS = \
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
INCLUDES += -I$(srcdir)/../src -I$(PUBLIC)/raptor -I$(PUBLIC)/xpcom
|
||||
INCLUDES += -I$(srcdir)/../src
|
||||
|
||||
|
|
|
|||
|
|
@ -34,5 +34,5 @@ LIBS = -lxpcom $(NSPR_LIBS)
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
INCLUDES += -I$(srcdir)/../public -I$(DIST)/include
|
||||
INCLUDES += -I$(srcdir)/../public -I$(PUBLIC)
|
||||
|
||||
|
|
|
|||
|
|
@ -34,5 +34,5 @@ LIBS = -lxpcom $(NSPR_LIBS)
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
INCLUDES += -I$(srcdir)/../public -I$(DIST)/include
|
||||
INCLUDES += -I$(srcdir)/../public
|
||||
|
||||
|
|
|
|||
|
|
@ -42,5 +42,5 @@ LIBS = \
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
INCLUDES += -I$(srcdir)/../public -I$(DIST)/include
|
||||
INCLUDES += -I$(srcdir)/../public
|
||||
|
||||
|
|
|
|||
|
|
@ -320,5 +320,5 @@ jscpucfg: jscpucfg.c
|
|||
endif
|
||||
|
||||
export:: jsautocfg.h
|
||||
$(INSTALL) -m 444 $< $(DIST)/include
|
||||
$(INSTALL) -m 444 $< $(PUBLIC)
|
||||
|
||||
|
|
|
|||
|
|
@ -57,5 +57,5 @@ include $(topsrcdir)/config/rules.mk
|
|||
|
||||
DEFINES += -D_IMPL_NS_HTML
|
||||
|
||||
INCLUDES += -I$(PUBLIC)/dom -I$(srcdir)/../../html/base/src
|
||||
INCLUDES += -I$(srcdir)/../../html/base/src
|
||||
|
||||
|
|
|
|||
|
|
@ -39,5 +39,3 @@ override NO_STATIC_LIB=
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
INCLUDES += -I$(DIST)/include/libutil
|
||||
|
||||
|
|
|
|||
|
|
@ -185,9 +185,9 @@ INCLUDES += -I$(srcdir)/../..
|
|||
ifeq ($(OS_ARCH),IRIX)
|
||||
# The assembler on IRIX (6.3 only?) seems to have trouble with the default command,
|
||||
# but works fine if we first copy the header and source file into the current dir.
|
||||
xptcstubs_asm_irix.o: $(DIST)/include/xptcstubsdef.inc $(srcdir)/xptcstubs_asm_irix.s
|
||||
xptcstubs_asm_irix.o: $(PUBLIC)/xptcstubsdef.inc $(srcdir)/xptcstubs_asm_irix.s
|
||||
@rm -f ./xptcstubsdef.inc
|
||||
@cp $(DIST)/include/xptcstubsdef.inc .
|
||||
@cp $(PUBLIC)/xptcstubsdef.inc .
|
||||
@if test ! -f ./Makefile.in; then rm -f ./xptcstubs_asm_irix.s; cp $(srcdir)/xptcstubs_asm_irix.s .; else true; fi
|
||||
$(AS) -o $@ $(ASFLAGS) $(AS_DASH_C_FLAG) ./xptcstubs_asm_irix.s
|
||||
@rm -f ./xptcstubsdef.inc
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче