зеркало из https://github.com/mozilla/pjs.git
Removed all references to obsolete OBJDIR variable.
Removed various sections of config.mk & rules.mk that were only used by OBJDIR or by a non-autoconf build.
This commit is contained in:
cls%seawood.org
Родитель
41b30a2a5c
Коммит
0991be09fa
|
|
@ -63,24 +63,17 @@ INCLUDES += -I$(srcdir)/../nsprpub/pr/include/md
|
|||
endif
|
||||
|
||||
ifeq ($(OS_ARCH)$(OS_RELEASE),IRIX5)
|
||||
TARGETS += $(OBJDIR)/gtscc$(BIN_SUFFIX)
|
||||
TARGETS += gtscc$(BIN_SUFFIX)
|
||||
endif
|
||||
|
||||
# Redefine MAKE_OBJDIR for just this directory
|
||||
define MAKE_OBJDIR
|
||||
if test ! -d $(@D); then rm -rf $(@D); mkdir $(@D); else true; fi
|
||||
endef
|
||||
|
||||
export:: $(TARGETS)
|
||||
|
||||
$(OBJDIR)/gtscc$(BIN_SUFFIX): $(OBJDIR)/gtscc.o
|
||||
@$(MAKE_OBJDIR)
|
||||
gtscc$(BIN_SUFFIX): gtscc.o
|
||||
$(CC) $(LDFLAGS) -o $@ $< -lelf
|
||||
$(INSTALL) -m 444 $@ $(DIST)/bin
|
||||
|
||||
#update build number from within make script
|
||||
$(DEPTH)/build/build_number: FORCE
|
||||
@$(MAKE_OBJDIR)
|
||||
$(RM) $@
|
||||
$(PERL) $(srcdir)/bdate.pl > $@
|
||||
$(PERL) $(srcdir)/aboutime.pl $(topsrcdir)/xpfe/browser/resources/locale/en-US/navigator.dtd $@
|
||||
|
|
@ -89,8 +82,7 @@ $(DEPTH)/build/build_number: FORCE
|
|||
$(DEPTH)/modules/libpref/src/init/all.js: FORCE
|
||||
$(PERL) $(srcdir)/set-timebomb.pl 0 30
|
||||
|
||||
$(OBJDIR)/bdate$(BIN_SUFFIX): $(OBJDIR)/bdate.o
|
||||
@$(MAKE_OBJDIR)
|
||||
bdate$(BIN_SUFFIX): bdate.o
|
||||
$(CC) $(LDFLAGS) -o $@ $<
|
||||
$(INSTALL) -m 444 $@ $(DIST)/bin
|
||||
|
||||
|
|
@ -106,8 +98,3 @@ clean clobber realclean clobber_all::
|
|||
cd $(MOZILLA_DETECT_DIR); $(MAKE) $@
|
||||
endif
|
||||
|
||||
# For the continuous build scripts.
|
||||
show_objname:
|
||||
@echo $(OBJDIR)
|
||||
|
||||
.PHONY: show_objname
|
||||
|
|
|
|||
|
|
@ -135,9 +135,6 @@ ACWHOAMI = @WHOAMI@
|
|||
ACUNZIP = @UNZIP@
|
||||
ACZIP = @ZIP@
|
||||
|
||||
OBJDIR_TAG = _AC
|
||||
OBJDIR_NAME = .
|
||||
|
||||
ifdef MOZ_NATIVE_JPEG
|
||||
JPEG_CFLAGS = @JPEG_CFLAGS@
|
||||
JPEG_LIBS = @JPEG_LIBS@
|
||||
|
|
|
|||
132
config/config.mk
132
config/config.mk
|
|
@ -185,14 +185,7 @@ endif
|
|||
#
|
||||
# Default command macros; can be overridden in <arch>.mk.
|
||||
#
|
||||
ifdef USE_AUTOCONF
|
||||
CCC = $(CXX)
|
||||
else
|
||||
AS = $(CC)
|
||||
ASFLAGS = $(CFLAGS)
|
||||
CC = gcc
|
||||
CCC = g++
|
||||
endif
|
||||
CCF = $(CC) $(CFLAGS)
|
||||
LINK_EXE = $(LINK) $(OS_LFLAGS) $(LFLAGS)
|
||||
LINK_DLL = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
|
||||
|
|
@ -244,9 +237,6 @@ INSTALL = $(NSINSTALL)
|
|||
JAVA_PROG = java
|
||||
else
|
||||
PATH_SEPARATOR := :
|
||||
ifndef USE_AUTOCONF
|
||||
DLL_SUFFIX = so
|
||||
endif
|
||||
LIB_SUFFIX = a
|
||||
ifeq ($(AWT_11),1)
|
||||
JAVA_PROG = $(NS_BIN)java
|
||||
|
|
@ -266,71 +256,15 @@ ifeq ($(OS_ARCH),OpenVMS)
|
|||
include $(topsrcdir)/config/$(OS_ARCH).mk
|
||||
endif
|
||||
|
||||
ifdef USE_AUTOCONF
|
||||
OPTIMIZER =
|
||||
ifndef MOZ_DEBUG
|
||||
DEFINES += -UDEBUG -DNDEBUG -DTRIMMED
|
||||
endif
|
||||
XBCFLAGS =
|
||||
else
|
||||
|
||||
#
|
||||
# Debug by default.
|
||||
#
|
||||
OBJDIR_TAG = _DBG
|
||||
OPTIMIZER = -g
|
||||
JAVA_OPTIMIZER = -g
|
||||
XBCFLAGS = -FR$*
|
||||
XCFLAGS = $(LCFLAGS)
|
||||
XLFLAGS = $(LLFLAGS)
|
||||
|
||||
ifeq ($(OS_ARCH),OS2)
|
||||
OPTIMIZER = -Ti+
|
||||
XLFLAGS += -DEBUG
|
||||
ifdef BUILD_PROFILE
|
||||
OPTIMIZER += -Gh+
|
||||
OBJDIR_TAG = _PRF
|
||||
else
|
||||
OPTIMIZER += -DDEBUG
|
||||
ifdef BUILD_MEMDBG
|
||||
OPTIMIZER += -Tm+ -DXP_OS2_MEMDEBUG=1
|
||||
OBJDIR_TAG = _MEM
|
||||
endif
|
||||
endif
|
||||
else
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
OPTIMIZER = -Od -Z7
|
||||
JAVA_OPTIMIZER = $(OPTIMIZER)
|
||||
XLFLAGS += -DEBUG
|
||||
else
|
||||
DEFINES = -DDEBUG -UNDEBUG -DDEBUG_$(shell $(WHOAMI)) -DTRACING
|
||||
endif
|
||||
endif
|
||||
|
||||
ifdef BUILD_OPT
|
||||
OBJDIR_TAG = _OPT
|
||||
XBCFLAGS =
|
||||
ifeq ($(OS_ARCH),OS2)
|
||||
OPTIMIZER = -O+ -Oi -DNDEBUG
|
||||
else
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
OPTIMIZER = -O2
|
||||
else
|
||||
OPTIMIZER = -O
|
||||
DEFINES = -UDEBUG -DNDEBUG -DTRIMMED
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif # !USE_AUTOCONF
|
||||
|
||||
ifdef MOZ_DEBUG
|
||||
ifdef USE_AUTOCONF
|
||||
OPTIMIZER =
|
||||
DEFINES += -DDEBUG -UNDEBUG -DDEBUG_$(shell $(WHOAMI)) -DTRACING
|
||||
else
|
||||
OPTIMIZER = -g
|
||||
DEFINES = -DDEBUG -UNDEBUG -DDEBUG_$(shell $(WHOAMI)) -DTRACING
|
||||
endif
|
||||
JAVA_OPTIMIZER = -g
|
||||
XBCFLAGS = -FR$*
|
||||
endif
|
||||
|
|
@ -388,15 +322,6 @@ endif
|
|||
#
|
||||
# Name of the binary code directories
|
||||
#
|
||||
ifndef USE_AUTOCONF
|
||||
ifeq ($(OS_ARCH)_$(PROCESSOR_ARCHITECTURE),WINNT_x86)
|
||||
OBJDIR_NAME = $(OS_CONFIG)$(OS_VERSION)$(OBJDIR_TAG).OBJ
|
||||
else
|
||||
OBJDIR_NAME = $(OS_CONFIG)$(OS_VERSION)$(PROCESSOR_ARCHITECTURE)$(COMPILER)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ
|
||||
endif
|
||||
|
||||
else
|
||||
# We're autoconf freaks here
|
||||
# Override defaults
|
||||
EMACS = $(ACEMACS)
|
||||
PERL = $(ACPERL)
|
||||
|
|
@ -404,12 +329,9 @@ RANLIB = $(ACRANLIB)
|
|||
UNZIP_PROG = $(ACUNZIP)
|
||||
WHOAMI = $(ACWHOAMI)
|
||||
ZIP_PROG = $(ACZIP)
|
||||
endif
|
||||
|
||||
BUILD = $(OBJDIR_NAME)
|
||||
OBJDIR = $(OBJDIR_NAME)
|
||||
XPDIST = $(DEPTH)/dist
|
||||
DIST = $(DEPTH)/dist/$(OBJDIR_NAME)
|
||||
DIST = $(DEPTH)/dist
|
||||
|
||||
# We need to know where to find the libraries we
|
||||
# put on the link line for binaries, and should
|
||||
|
|
@ -419,12 +341,7 @@ LIBS_DIR = -L$(DIST)/bin -L$(DIST)/lib
|
|||
# all public include files go in subdirectories of PUBLIC:
|
||||
PUBLIC = $(XPDIST)/include
|
||||
|
||||
ifdef USE_AUTOCONF
|
||||
DEPENDENCIES = .md
|
||||
else
|
||||
VPATH = $(OBJDIR)
|
||||
DEPENDENCIES = $(OBJDIR)/.md
|
||||
endif
|
||||
|
||||
ifneq ($(OS_ARCH),WINNT)
|
||||
|
||||
|
|
@ -436,10 +353,10 @@ MKDEPEND_DIR =
|
|||
MKDEPEND = $(MOZ_NATIVE_MAKEDEPEND) -Y -w 3000
|
||||
else
|
||||
MKDEPEND_DIR = $(DEPTH)/config/mkdepend
|
||||
MKDEPEND = $(MKDEPEND_DIR)/$(OBJDIR_NAME)/mkdepend
|
||||
MKDEPEND = $(MKDEPEND_DIR)/mkdepend
|
||||
endif
|
||||
|
||||
MKDEPENDENCIES = $(OBJDIR)/depend.mk
|
||||
MKDEPENDENCIES = depend.mk
|
||||
|
||||
endif
|
||||
|
||||
|
|
@ -467,25 +384,6 @@ MOZILLA_CLIENT = 1
|
|||
MOZ_JSD = 1
|
||||
endif
|
||||
|
||||
ifndef USE_AUTOCONF
|
||||
ifdef MOZ_LITE
|
||||
NO_UNIX_LDAP = 1
|
||||
MOZ_NAV_BUILD_PREFIX = 1
|
||||
else
|
||||
DEFINES += -DMOZ_COMMUNICATOR_IIDS
|
||||
MOZ_COMMUNICATOR_IIDS = 1
|
||||
MOZ_COMMUNICATOR_CONFIG_JS = 1
|
||||
MOZ_COPY_ALL_JARS = 1
|
||||
MOZ_EDITOR = 1
|
||||
endif
|
||||
|
||||
ifdef MOZ_MEDIUM
|
||||
ifndef MODULAR_NETLIB
|
||||
MOZ_MAIL_COMPOSE = 1
|
||||
endif
|
||||
endif
|
||||
endif # ! USE_AUTOCONF
|
||||
|
||||
ifdef MOZ_MAIL_COMPOSE
|
||||
DEFINES += -DMOZ_MAIL_COMPOSE
|
||||
endif
|
||||
|
|
@ -542,12 +440,6 @@ endif
|
|||
# Platform dependent switching off of JAVA
|
||||
#
|
||||
|
||||
ifndef MOZ_JAVA
|
||||
ifndef USE_AUTOCONF
|
||||
MOZ_OJI = 1 # on by default now
|
||||
endif
|
||||
endif
|
||||
|
||||
ifdef MOZ_LIBTEST
|
||||
DEFINES += -DLAYPROBE_API
|
||||
MOZ_LIBTEST = 1
|
||||
|
|
@ -603,13 +495,6 @@ PROF_FLAGS = $(OS_GPROF_FLAGS) -DMOZILLA_GPROF
|
|||
endif
|
||||
endif
|
||||
|
||||
# This compiles in heap dumping utilities and other good stuff
|
||||
# for developers -- maybe we only want it in for a special SDK
|
||||
# nspr/java runtime(?):
|
||||
ifndef USE_AUTOCONF
|
||||
DEFINES += -DDEVELOPER_DEBUG
|
||||
endif
|
||||
|
||||
ifndef MOZ_FE
|
||||
MOZ_FE = x
|
||||
endif
|
||||
|
|
@ -623,7 +508,7 @@ SDK = $(DEPTH)/dist/sdk
|
|||
endif
|
||||
|
||||
ifneq ($(OS_ARCH),WINNT)
|
||||
NSINSTALL = $(DEPTH)/config/$(OBJDIR_NAME)/nsinstall
|
||||
NSINSTALL = $(DEPTH)/config/nsinstall
|
||||
|
||||
ifeq ($(NSDISTMODE),copy)
|
||||
# copy files, but preserve source mtime
|
||||
|
|
@ -708,12 +593,3 @@ else
|
|||
JAVA_DEFINES += -DAWT_102
|
||||
endif
|
||||
|
||||
# I don't believe this is still true -cls
|
||||
ifndef USE_AUTOCONF
|
||||
|
||||
# From nsprpub/config/config.mk, mozilla/jpeg needs to know
|
||||
# about USE_PTHREADS. This fixes platforms like SparcLinux. -mcafee
|
||||
ifeq ($(USE_PTHREADS), 1)
|
||||
DEFINES += -D_PR_PTHREADS -UHAVE_CVAR_BUILT_ON_SEM
|
||||
endif
|
||||
endif #!USE_AUTOCONF
|
||||
|
|
|
|||
100
config/rules.mk
100
config/rules.mk
|
|
@ -42,13 +42,10 @@
|
|||
# (used to define $OBJS)
|
||||
# d)
|
||||
# PROGRAM -- the target program name to create from $OBJS
|
||||
# ($OBJDIR automatically prepended to it)
|
||||
# d2)
|
||||
# SIMPLE_PROGRAMS -- Compiles Foo.cpp Bar.cpp into Foo, Bar executables.
|
||||
# ($OBJDIR automatically prepended to it)
|
||||
# e)
|
||||
# LIBRARY_NAME -- the target library name to create from $OBJS
|
||||
# ($OBJDIR automatically prepended to it)
|
||||
# f)
|
||||
# JSRCS -- java source files to compile into class files
|
||||
# (if you don't specify this it will default to *.java)
|
||||
|
|
@ -80,14 +77,6 @@ ifndef NS_CONFIG_MK
|
|||
include $(topsrcdir)/config/config.mk
|
||||
endif
|
||||
|
||||
ifdef PROGRAM
|
||||
PROGRAM := $(addprefix $(OBJDIR)/, $(PROGRAM))
|
||||
endif
|
||||
|
||||
ifdef SIMPLE_PROGRAMS
|
||||
SIMPLE_PROGRAMS := $(addprefix $(OBJDIR)/, $(SIMPLE_PROGRAMS))
|
||||
endif
|
||||
|
||||
#
|
||||
# Library rules
|
||||
#
|
||||
|
|
@ -107,8 +96,6 @@ DEF_FILE := $(LIBRARY:.lib=.def)
|
|||
endif # DEF_FILE
|
||||
endif # LIBRARY
|
||||
|
||||
LIBRARY := $(addprefix $(OBJDIR)/, $(LIBRARY))
|
||||
|
||||
ifndef NO_SHARED_LIB
|
||||
ifdef MKSHLIB
|
||||
|
||||
|
|
@ -165,17 +152,6 @@ ifndef OBJS
|
|||
OBJS = $(JRI_STUB_CFILES) $(addsuffix .o, $(JMC_GEN)) $(CSRCS:.c=.o) $(CPPSRCS:.cpp=.o) $(ASFILES:.s=.o)
|
||||
endif
|
||||
|
||||
OBJS := $(addprefix $(OBJDIR)/, $(OBJS))
|
||||
|
||||
ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
|
||||
ifdef DLL
|
||||
DLL := $(addprefix $(OBJDIR)/, $(DLL))
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
LIB := $(addprefix $(OBJDIR)/, $(LIB))
|
||||
endif # WINNT
|
||||
endif # DLL
|
||||
endif # OS2, WINNT
|
||||
|
||||
ifndef OS2_IMPLIB
|
||||
LIBOBJS := $(addprefix \", $(OBJS))
|
||||
LIBOBJS := $(addsuffix \", $(LIBOBJS))
|
||||
|
|
@ -198,10 +174,6 @@ ALL_TRASH = $(TARGETS) $(OBJS) LOGS TAGS $(GARBAGE) a.out \
|
|||
_gen _stubs $(MDDEPDIR) $(wildcard gts_tmp_*)
|
||||
endif
|
||||
|
||||
ifndef USE_AUTOCONF
|
||||
ALL_TRASH += $(OBJDIR)
|
||||
endif
|
||||
|
||||
ifdef JAVA_OR_NSJVM
|
||||
ifdef JDIRS
|
||||
ALL_TRASH += $(addprefix $(JAVA_DESTPATH)/,$(JDIRS))
|
||||
|
|
@ -279,8 +251,8 @@ alldep:: export depend libs install
|
|||
everything:: realclean alldep
|
||||
|
||||
#
|
||||
# Rules to make OBJDIR and MDDEPDIR (for --enable-md).
|
||||
# These rules replace the MAKE_OBJDIR and MAKE_DEPDIR macros.
|
||||
# Rules to make MDDEPDIR (for --enable-md).
|
||||
# These rules replace the MAKE_DEPDIR macro.
|
||||
# The macros often failed with parallel builds (-jN),
|
||||
# because two processes would simultaneously try to make the same directory.
|
||||
# Using these rules insures that 'make' will have only one process
|
||||
|
|
@ -301,13 +273,6 @@ MAKE_DIRS += $(MDDEPDIR)
|
|||
endif
|
||||
endif
|
||||
|
||||
ifneq "$(OBJDIR)" "."
|
||||
$(OBJDIR):
|
||||
@if test ! -d $@; then echo Creating $@; rm -rf $@; $(NSINSTALL) -D $@; else true; fi
|
||||
|
||||
MAKE_DIRS += $(OBJDIR)
|
||||
endif
|
||||
|
||||
ifdef ALL_PLATFORMS
|
||||
all_platforms:: $(NFSPWD)
|
||||
@d=`$(NFSPWD)`; \
|
||||
|
|
@ -516,7 +481,7 @@ endif
|
|||
# creates Foo.o Bar.o, links with LIBS to create Foo, Bar.
|
||||
#
|
||||
#
|
||||
$(SIMPLE_PROGRAMS):$(OBJDIR)/%: $(OBJDIR)/%.o $(EXTRA_DEPS) Makefile Makefile.in
|
||||
$(SIMPLE_PROGRAMS):%: %.o $(EXTRA_DEPS) Makefile Makefile.in
|
||||
ifeq ($(CPP_PROG_LINK),1)
|
||||
$(CCC) $(WRAP_MALLOC_CFLAGS) -o $@ $< $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB)
|
||||
$(MOZ_POST_PROGRAM_COMMAND) $@
|
||||
|
|
@ -621,14 +586,13 @@ endif
|
|||
endif
|
||||
else
|
||||
@touch no-such-file.vms; rm -f no-such-file.vms $(SUB_LOBJS)
|
||||
@if test ! -f $(OBJDIR)/VMSuni.opt; then \
|
||||
echo "Creating universal symbol option file $(OBJDIR)/VMSuni.opt"; \
|
||||
@if test ! -f VMSuni.opt; then \
|
||||
echo "Creating universal symbol option file VMSuni.opt"; \
|
||||
for lib in $(SHARED_LIBRARY_LIBS); do $(AR_EXTRACT) $${lib}; $(CLEANUP2); done; \
|
||||
create_opt_uni $(OBJS) $(SUB_LOBJS); \
|
||||
mv VMSuni.opt $(OBJDIR); \
|
||||
fi
|
||||
@touch no-such-file.vms; rm -f no-such-file.vms $(SUB_LOBJS)
|
||||
$(MKSHLIB) -o $@ $(OBJS) $(LOBJS) $(EXTRA_DSO_LDOPTS) $(OBJDIR)/VMSuni.opt;
|
||||
$(MKSHLIB) -o $@ $(OBJS) $(LOBJS) $(EXTRA_DSO_LDOPTS) VMSuni.opt;
|
||||
@echo "`translate $@`" > $(@:.$(DLL_SUFFIX)=.vms)
|
||||
endif
|
||||
chmod +x $@
|
||||
|
|
@ -651,45 +615,45 @@ else
|
|||
endif
|
||||
endif
|
||||
|
||||
$(OBJDIR)/%: %.c
|
||||
%: %.c
|
||||
ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
|
||||
$(CC) -Fo$@ -c $(CFLAGS) $<
|
||||
else
|
||||
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
|
||||
endif
|
||||
|
||||
$(OBJDIR)/%.o: %.c
|
||||
%.o: %.c
|
||||
ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
|
||||
$(CC) -Fo$@ -c $(CFLAGS) $<
|
||||
else
|
||||
$(CC) -o $@ -c $(CFLAGS) $<
|
||||
endif
|
||||
|
||||
$(OBJDIR)/moc_%.cpp: %.h
|
||||
moc_%.cpp: %.h
|
||||
$(MOC) $< -o $@
|
||||
|
||||
# The AS_DASH_C_FLAG is needed cause not all assemblers (Solaris) accept
|
||||
# a '-c' flag.
|
||||
$(OBJDIR)/%.o: %.s
|
||||
%.o: %.s
|
||||
$(AS) -o $@ $(ASFLAGS) $(AS_DASH_C_FLAG) $<
|
||||
|
||||
$(OBJDIR)/%.o: %.S
|
||||
%.o: %.S
|
||||
$(AS) -o $@ $(ASFLAGS) -c $<
|
||||
|
||||
$(OBJDIR)/%: %.cpp
|
||||
%: %.cpp
|
||||
$(CCC) -o $@ $(CXXFLAGS) $< $(LDFLAGS)
|
||||
|
||||
#
|
||||
# Please keep the next two rules in sync.
|
||||
#
|
||||
$(OBJDIR)/%.o: %.cc
|
||||
%.o: %.cc
|
||||
$(CCC) -o $@ -c $(CXXFLAGS) $<
|
||||
|
||||
$(OBJDIR)/%.o: %.cpp
|
||||
%.o: %.cpp
|
||||
ifdef STRICT_CPLUSPLUS_SUFFIX
|
||||
echo "#line 1 \"$*.cpp\"" | cat - $*.cpp > $(OBJDIR)/t_$*.cc
|
||||
$(CCC) -o $@ -c $(CXXFLAGS) $(OBJDIR)/t_$*.cc
|
||||
rm -f $(OBJDIR)/t_$*.cc
|
||||
echo "#line 1 \"$*.cpp\"" | cat - $*.cpp > t_$*.cc
|
||||
$(CCC) -o $@ -c $(CXXFLAGS) t_$*.cc
|
||||
rm -f t_$*.cc
|
||||
else
|
||||
ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
|
||||
$(CCC) -Fo$@ -c $(CXXFLAGS) $<
|
||||
|
|
@ -737,7 +701,7 @@ endif
|
|||
# Update Makefiles
|
||||
###############################################################################
|
||||
#
|
||||
$(OBJDIR)/Makefile: Makefile.in
|
||||
Makefile: Makefile.in
|
||||
@echo Updating $@
|
||||
$(topsrcdir)/build/autoconf/update-makefile.sh
|
||||
|
||||
|
|
@ -952,7 +916,7 @@ INCLUDES += -I$(JMC_GEN_DIR) -I.
|
|||
ifdef JAVA_OR_NSJVM
|
||||
JMC_HEADERS = $(patsubst %,$(JMC_GEN_DIR)/%.h,$(JMC_GEN))
|
||||
JMC_STUBS = $(patsubst %,$(JMC_GEN_DIR)/%.c,$(JMC_GEN))
|
||||
JMC_OBJS = $(patsubst %,$(OBJDIR)/%.o,$(JMC_GEN))
|
||||
JMC_OBJS = $(patsubst %,%.o,$(JMC_GEN))
|
||||
|
||||
$(JMC_GEN_DIR)/M%.h: $(JMCSRCDIR)/%.class
|
||||
$(JMC) -d $(JMC_GEN_DIR) -interface $(JMC_GEN_FLAGS) $(?F:.class=)
|
||||
|
|
@ -960,7 +924,7 @@ $(JMC_GEN_DIR)/M%.h: $(JMCSRCDIR)/%.class
|
|||
$(JMC_GEN_DIR)/M%.c: $(JMCSRCDIR)/%.class
|
||||
$(JMC) -d $(JMC_GEN_DIR) -module $(JMC_GEN_FLAGS) $(?F:.class=)
|
||||
|
||||
$(OBJDIR)/M%.o: $(JMC_GEN_DIR)/M%.h $(JMC_GEN_DIR)/M%.c
|
||||
M%.o: $(JMC_GEN_DIR)/M%.h $(JMC_GEN_DIR)/M%.c
|
||||
ifeq ($(OS_ARCH),OS2)
|
||||
$(CC) -Fo$@ -c $(CFLAGS) $(JMC_GEN_DIR)/M$*.c
|
||||
else
|
||||
|
|
@ -1185,7 +1149,7 @@ ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
|
|||
if ($$found) { \
|
||||
print "Removing stale dependency $< from $(DEPENDENCIES)\n"; \
|
||||
seek(MD, 0, 0); \
|
||||
$$tmpname = "$(OBJDIR)/fix.md" . $$$$; \
|
||||
$$tmpname = "fix.md" . $$$$; \
|
||||
open(TMD, "> " . $$tmpname); \
|
||||
while (<MD>) { \
|
||||
s@ \.*/*$< @ @; \
|
||||
|
|
@ -1226,12 +1190,8 @@ endif
|
|||
else
|
||||
$(MKDEPENDENCIES)::
|
||||
touch $(MKDEPENDENCIES)
|
||||
ifdef USE_AUTOCONF
|
||||
$(MKDEPEND) -p$(OBJDIR_NAME)/ -o'.o' -f$(MKDEPENDENCIES) $(DEFINES) $(ACDEFINES) $(INCLUDES) $(addprefix $(srcdir)/,$(CSRCS) $(CPPSRCS)) >/dev/null 2>&1
|
||||
@mv depend.mk depend.mk.old && cat depend.mk.old | sed "s|^$(OBJDIR_NAME)/$(srcdir)/|$(OBJDIR_NAME)/|g" > depend.mk && rm -f depend.mk.old
|
||||
else
|
||||
$(MKDEPEND) -p$(OBJDIR_NAME)/ -o'.o' -f$(MKDEPENDENCIES) $(INCLUDES) $(CSRCS) $(CPPSRCS)
|
||||
endif
|
||||
$(MKDEPEND) -o'.o' -f$(MKDEPENDENCIES) $(DEFINES) $(ACDEFINES) $(INCLUDES) $(addprefix $(srcdir)/,$(CSRCS) $(CPPSRCS)) >/dev/null 2>&1
|
||||
@mv depend.mk depend.mk.old && cat depend.mk.old | sed "s|^$(srcdir)/||g" > depend.mk && rm -f depend.mk.old
|
||||
|
||||
ifndef MOZ_NATIVE_MAKEDEPEND
|
||||
$(MKDEPEND):
|
||||
|
|
@ -1239,18 +1199,6 @@ $(MKDEPEND):
|
|||
cd $(MKDEPEND_DIR); $(MAKE)
|
||||
endif
|
||||
|
||||
# Dont do the detect hackery for autoconf builds. It makes them painfully
|
||||
# slow and its not needed anyway, since autoconf does it much better.
|
||||
ifndef USE_AUTOCONF
|
||||
|
||||
# Rules to for detection
|
||||
$(MOZILLA_DETECT_GEN):
|
||||
cd $(MOZILLA_DETECT_DIR); $(MAKE)
|
||||
|
||||
detect: $(MOZILLA_DETECT_GEN)
|
||||
|
||||
endif # ! USE_AUTOCONF
|
||||
|
||||
ifndef MOZ_NATIVE_MAKEDEPEND
|
||||
MKDEPEND_BUILTIN = $(MKDEPEND)
|
||||
else
|
||||
|
|
@ -1268,7 +1216,7 @@ dependclean::
|
|||
rm -f $(MKDEPENDENCIES)
|
||||
+$(LOOP_OVER_DIRS)
|
||||
|
||||
-include $(OBJDIR)/depend.mk
|
||||
-include depend.mk
|
||||
|
||||
endif # ! COMPILER_DEPEND
|
||||
|
||||
|
|
|
|||
16
configure.in
16
configure.in
|
|
@ -190,7 +190,7 @@ dnl ========================================================
|
|||
if test "$GNU_CC"; then
|
||||
MKSHLIB='$(CXX) $(DSO_LDOPTS)'
|
||||
MKCSHLIB='$(CC) $(DSO_LDOPTS)'
|
||||
DSO_LDOPTS='-shared -Wl,-h -Wl,$(@:$(OBJDIR)/%.$(DLL_SUFFIX)=%.$(DLL_SUFFIX))'
|
||||
DSO_LDOPTS='-shared -Wl,-h -Wl,$@'
|
||||
DSO_CFLAGS=''
|
||||
DSO_PIC_CFLAGS='-fPIC'
|
||||
|
||||
|
|
@ -210,7 +210,7 @@ if test "$GNU_CC"; then
|
|||
else
|
||||
MKSHLIB='$(LD) $(DSO_LDOPTS)'
|
||||
MKCSHLIB='$(LD) $(DSO_LDOPTS)'
|
||||
DSO_LDOPTS='-shared -h $(@:$(OBJDIR)/%.$(DLL_SUFFIX)=%.$(DLL_SUFFIX))'
|
||||
DSO_LDOPTS='-shared -h $@'
|
||||
DSO_CFLAGS=''
|
||||
DSO_PIC_CFLAGS='-KPIC'
|
||||
_DEFINES_CFLAGS='$(ACDEFINES)'
|
||||
|
|
@ -415,7 +415,7 @@ alpha*-*-linux*)
|
|||
DLL_SUFFIX="so.1.0"
|
||||
DSO_CFLAGS=''
|
||||
DSO_PIC_CFLAGS='-fPIC'
|
||||
DSO_LDOPTS='-shared -h $(@:$(OBJDIR)/%.$(DLL_SUFFIX)=%.$(DLL_SUFFIX))'
|
||||
DSO_LDOPTS='-shared -h $@'
|
||||
MKSHLIB='$(LD) $(DSO_LDOPTS)'
|
||||
MKCSHLIB='$(LD) $(DSO_LDOPTS)'
|
||||
if $CC -E - -dM </dev/null | grep -v __ELF__ >/dev/null; then
|
||||
|
|
@ -436,11 +436,11 @@ alpha*-*-linux*)
|
|||
|
||||
alpha*-*-osf*)
|
||||
if test "$GNU_CC"; then
|
||||
DSO_LDOPTS='-shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.$(DLL_SUFFIX)=%.$(DLL_SUFFIX))'
|
||||
DSO_LDOPTS='-shared -Wl,-soname -Wl,$@'
|
||||
else
|
||||
CFLAGS="$CFLAGS -std1 -ieee_with_inexact"
|
||||
CXXFLAGS="$CXXFLAGS -std1 -ieee_with_inexact"
|
||||
DSO_LDOPTS='-shared -msym -expect_unresolved \* -soname $(@:$(OBJDIR)/%.$(DLL_SUFFIX)=%.$(DLL_SUFFIX))'
|
||||
DSO_LDOPTS='-shared -msym -expect_unresolved \* -soname $@'
|
||||
DSO_CFLAGS=
|
||||
MKSHLIB='-$(LD) $(DSO_LDOPTS)'
|
||||
MKCSHLIB='-$(LD) $(DSO_LDOPTS)'
|
||||
|
|
@ -470,7 +470,7 @@ alpha*-*-osf*)
|
|||
*-sco*)
|
||||
CXXFLAGS="$CXXFLAGS -I/usr/include/CC"
|
||||
if test ! "$GNU_CC"; then
|
||||
DSO_LDOPTS='-G -h $(@:$(OBJDIR)/%.$(DLL_SUFFIX)=%.$(DLL_SUFFIX))'
|
||||
DSO_LDOPTS='-G -h $@'
|
||||
fi
|
||||
;;
|
||||
|
||||
|
|
@ -484,7 +484,7 @@ dnl the qsort routine under solaris is faulty
|
|||
MKCSHLIB='$(CC) $(DSO_LDOPTS)'
|
||||
MKSHLIB_FORCE_ALL='-z allextract'
|
||||
MKSHLIB_UNFORCE_ALL=''
|
||||
DSO_LDOPTS='-G -h $(@:$(OBJDIR)/%.$(DLL_SUFFIX)=%.$(DLL_SUFFIX))'
|
||||
DSO_LDOPTS='-G -h $@'
|
||||
AR='$(CXX) -xar -o $@'
|
||||
AS='/usr/ccs/bin/as'
|
||||
AS_DASH_C_FLAG=''
|
||||
|
|
@ -509,7 +509,7 @@ dnl the qsort routine under solaris is faulty
|
|||
MKSHLIB_FORCE_ALL='-z allextract'
|
||||
MKSHLIB_UNFORCE_ALL=''
|
||||
fi
|
||||
DSO_LDOPTS='-G -h $(@:$(OBJDIR)/%.$(DLL_SUFFIX)=%.$(DLL_SUFFIX))'
|
||||
DSO_LDOPTS='-G -h $@'
|
||||
_WARNINGS_CFLAGS=''
|
||||
_WARNINGS_CXXFLAGS=''
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -124,7 +124,7 @@ LIBRARY = js$(MOZ_BITS)$(VERSION_NUMBER).$(LIB_SUFFIX)
|
|||
DEF_FILE = jsos2$(VERSION_NUMBER).def
|
||||
EXTRA_LIBS = $(NSPR_LIBS) $(LIBNSJAVA)
|
||||
else
|
||||
EXTRA_LIBS = $(NSPR_LIBS) $(LIBNSJAVA) $(OBJDIR)/libjs.lib
|
||||
EXTRA_LIBS = $(NSPR_LIBS) $(LIBNSJAVA) libjs.lib
|
||||
endif
|
||||
OS_CFLAGS += -tm-
|
||||
endif
|
||||
|
|
@ -144,7 +144,7 @@ DEFINES += -DEXPORT_JS_API
|
|||
|
||||
INCLUDES += -I$(srcdir)
|
||||
|
||||
GARBAGE += $(JSMATH_PRELINK) $(OBJDIR)/jscpucfg.o $(OBJDIR)/jsautocfg.h $(OBJDIR)/jsautocfg.tmp
|
||||
GARBAGE += $(JSMATH_PRELINK) jscpucfg.o jsautocfg.h jsautocfg.tmp
|
||||
|
||||
ifneq ($(findstring -L,$(NSPR_LIBS)),)
|
||||
NSPR_STATIC_PATH = $(subst -L,,$(findstring -L,$(NSPR_LIBS)))
|
||||
|
|
@ -239,11 +239,9 @@ endif
|
|||
# special rule for jsmath.o since we want to incrementally link
|
||||
# against fdlibm to pull in only what is needed
|
||||
jsmath.o: $(FDLIBM_LIBRARY) $(JSMATH_PRELINK)
|
||||
@$(MAKE_OBJDIR)
|
||||
$(LD) $(DASH_R) -o $@ $(JSMATH_PRELINK) $(FDLIBM_LIBRARY)
|
||||
|
||||
$(JSMATH_PRELINK): jsmath.c
|
||||
@$(MAKE_OBJDIR)
|
||||
ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
|
||||
$(CC) -Fo$@ -c $(CFLAGS) $<
|
||||
else
|
||||
|
|
@ -253,8 +251,7 @@ endif
|
|||
# An AIX Optimization bug causes PR_dtoa() & JS_dtoa to produce wrong result.
|
||||
# This suppresses optimization for this single compilation unit.
|
||||
ifeq ($(OS_ARCH),AIX)
|
||||
$(OBJDIR)/jsdtoa.o: jsdtoa.c
|
||||
@$(MAKE_OBJDIR)
|
||||
jsdtoa.o: jsdtoa.c
|
||||
$(CC) -o $@ -c $(filter-out -O, $(CFLAGS)) $<
|
||||
endif
|
||||
|
||||
|
|
@ -269,20 +266,20 @@ $(FDLIBM_LIBRARY):
|
|||
|
||||
jsopcode.h jsopcode.c: jsopcode.tbl
|
||||
|
||||
$(OBJDIR)/jsautocfg.h: $(OBJDIR)/jscpucfg
|
||||
@rm -f $@ $(OBJDIR)/jsautocfg.tmp
|
||||
$(OBJDIR)/jscpucfg > $(OBJDIR)/jsautocfg.tmp
|
||||
mv $(OBJDIR)/jsautocfg.tmp $@
|
||||
jsautocfg.h: jscpucfg
|
||||
@rm -f $@ jsautocfg.tmp
|
||||
./jscpucfg > jsautocfg.tmp
|
||||
mv jsautocfg.tmp $@
|
||||
|
||||
ifeq ($(OS_ARCH),OpenVMS)
|
||||
# force a posix build for OpenVMS
|
||||
$(OBJDIR)/jscpucfg.o: jscpucfg.c
|
||||
jscpucfg.o: jscpucfg.c
|
||||
c89 -c -o $@ $<
|
||||
|
||||
$(OBJDIR)/jscpucfg: $(OBJDIR)/jscpucfg.o
|
||||
jscpucfg: jscpucfg.o
|
||||
c89 -o $@ $<
|
||||
endif
|
||||
|
||||
export:: $(OBJDIR)/jsautocfg.h
|
||||
export:: jsautocfg.h
|
||||
$(INSTALL) -m 444 $< $(DIST)/include
|
||||
|
||||
|
|
|
|||
|
|
@ -90,18 +90,18 @@ include $(topsrcdir)/config/rules.mk
|
|||
# These make rules only works on IRIX...sigh
|
||||
|
||||
ifeq ($(OS_ARCH),IRIX)
|
||||
jsj_nodl.c: $(OBJDIR)/stubs.o Makefile $(DEPTH)/config/nodl.pl
|
||||
jsj_nodl.c: stubs.o Makefile $(DEPTH)/config/nodl.pl
|
||||
rm -f $@
|
||||
$(PERL) $(DEPTH)/config/nodl.pl "jsj_nodl_tab" \
|
||||
`nm -Bn $(OBJDIR)/stubs.o | egrep Java_.*_stub | awk '{print $$3;}'` > $@
|
||||
`nm -Bn stubs.o | egrep Java_.*_stub | awk '{print $$3;}'` > $@
|
||||
endif
|
||||
|
||||
ifdef JAVA_OR_OJI
|
||||
$(OBJDIR)/stubs.o: \
|
||||
stubs.o: \
|
||||
$(JNI_GEN_DIR)/netscape_javascript_JSObject.c \
|
||||
$(JNI_GEN_DIR)/netscape_javascript_JSException.c \
|
||||
$(NULL)
|
||||
else
|
||||
$(OBJDIR)/stubs.o:
|
||||
stubs.o:
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ natives_list:: FORCE
|
|||
|
||||
check_natives:: natives_list
|
||||
rm -f found_natives
|
||||
nm -B ../$(OBJDIR)/*.o \
|
||||
nm -B ../*.o \
|
||||
| egrep "Java.*_stub" | awk '{ print $$3; }' | sort > found_natives
|
||||
diff found_natives natives_list
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ VPATH = @srcdir@
|
|||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
ifdef POLARIS
|
||||
SHARED_LIBRARY = $(OBJDIR)/libAutoAdmin.so
|
||||
SHARED_LIBRARY = libAutoAdmin.so
|
||||
endif
|
||||
|
||||
XFEDIR = $(DEPTH)/cmd/xfe
|
||||
|
|
@ -34,7 +34,7 @@ REQUIRES = dbm ldap js pref
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
INCLUDES += -I$(topsrcdir)/cmd/xfe/icons -I$(DEPTH)/cmd/xfe/icons/$(OBJDIR)
|
||||
INCLUDES += -I$(topsrcdir)/cmd/xfe/icons -I$(DEPTH)/cmd/xfe/icons
|
||||
DEFINES += -DPOLARIS
|
||||
GARBAGE += icondata.c
|
||||
|
||||
|
|
@ -52,4 +52,4 @@ polaris: $(SHARED_LIBRARY)
|
|||
icondata.c:
|
||||
@rm -f icondata.c $(NOSUCHFILE)
|
||||
@cd $(XFEDIR)/icons; $(MAKE)
|
||||
@ln -s $(XFEDIR)/icons/$(OBJDIR)/icondata.c $@
|
||||
@ln -s $(XFEDIR)/icons/icondata.c $@
|
||||
|
|
|
|||
|
|
@ -28,12 +28,12 @@ include $(topsrcdir)/config/rules.mk
|
|||
|
||||
LIBS = -L$(DIST)/lib -lhash
|
||||
|
||||
all:: other-stuff $(OBJDIR)/resources $(OBJDIR)/un-obscure
|
||||
all:: other-stuff resources un-obscure
|
||||
|
||||
other-stuff:
|
||||
cd $(DEPTH)/config; $(MAKE)
|
||||
cd $(DEPTH)/security/lib/util; $(MAKE) export
|
||||
cd $(DEPTH)/security/lib/hash; $(MAKE)
|
||||
|
||||
$(OBJDIR)/resources: $(OBJDIR)/resources.o
|
||||
resources: resources.o
|
||||
$(CC) -o $@ $< $(LIBS)
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ REQUIRES = libreg pref js
|
|||
CSRCS = reg.c VerReg.c vr_stubs.c
|
||||
|
||||
BIN_SRCS = VerReg.c reg.c vr_stubs.c
|
||||
BIN_OBJS = $(addprefix $(OBJDIR)/R_,$(BIN_SRCS:.c=.o))
|
||||
BIN_OBJS = $(addprefix R_,$(BIN_SRCS:.c=.o))
|
||||
|
||||
# force the creation of a static lib.
|
||||
override NO_STATIC_LIB=
|
||||
|
|
@ -47,10 +47,9 @@ endif
|
|||
INCLUDES += -I$(topsrcdir)/include
|
||||
GARBAGE += $(PROGRAM) $(BIN_OBJS)
|
||||
|
||||
PROGRAM = $(OBJDIR)/vreg$(BIN_SUFFIX)
|
||||
PROGRAM = vreg$(BIN_SUFFIX)
|
||||
|
||||
$(PROGRAM): $(BIN_OBJS)
|
||||
@$(MAKE_OBJDIR)
|
||||
ifeq ($(OS_ARCH), OS2)
|
||||
$(LINK_EXE) -OUT:$@ $(BIN_OBJS) $(LDFLAGS) $(OS_LIBS)
|
||||
else
|
||||
|
|
@ -61,24 +60,21 @@ else
|
|||
endif
|
||||
endif
|
||||
|
||||
$(OBJDIR)/R_VerReg.o: VerReg.c
|
||||
@$(MAKE_OBJDIR)
|
||||
R_VerReg.o: VerReg.c
|
||||
ifeq ($(OS_ARCH), OS2)
|
||||
$(CC) -Fo$@ -c $(CFLAGS) -DSTANDALONE_REGISTRY $<
|
||||
else
|
||||
$(CC) -o $@ -c $(CFLAGS) -DSTANDALONE_REGISTRY $<
|
||||
endif
|
||||
|
||||
$(OBJDIR)/R_reg.o: reg.c
|
||||
@$(MAKE_OBJDIR)
|
||||
R_reg.o: reg.c
|
||||
ifeq ($(OS_ARCH), OS2)
|
||||
$(CC) -Fo$@ -c $(CFLAGS) -DSTANDALONE_REGISTRY $<
|
||||
else
|
||||
$(CC) -o $@ -c $(CFLAGS) -DSTANDALONE_REGISTRY $<
|
||||
endif
|
||||
|
||||
$(OBJDIR)/R_vr_stubs.o: vr_stubs.c
|
||||
@$(MAKE_OBJDIR)
|
||||
R_vr_stubs.o: vr_stubs.c
|
||||
ifeq ($(OS_ARCH), OS2)
|
||||
$(CC) -Fo$@ -c $(CFLAGS) -DSTANDALONE_REGISTRY $<
|
||||
else
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ REQUIRES=
|
|||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
SIMPLE_PROGRAMS = $(addprefix $(OBJDIR)/, $(CPPSRCS:.cpp=))
|
||||
SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=)
|
||||
|
||||
# hack until necko lands
|
||||
ifndef NECKO
|
||||
|
|
|
|||
|
|
@ -188,7 +188,7 @@ 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.
|
||||
$(OBJDIR)/xptcstubs_asm_irix.o: $(DIST)/include/xptcstubsdef.inc $(srcdir)/xptcstubs_asm_irix.s
|
||||
xptcstubs_asm_irix.o: $(DIST)/include/xptcstubsdef.inc $(srcdir)/xptcstubs_asm_irix.s
|
||||
@rm -f ./xptcstubsdef.inc
|
||||
@cp $(DIST)/include/xptcstubsdef.inc .
|
||||
@if test ! -f ./Makefile.in; then rm -f ./xptcstubs_asm_irix.s; cp $(srcdir)/xptcstubs_asm_irix.s .; else true; fi
|
||||
|
|
@ -202,7 +202,7 @@ ifeq ($(OS_ARCH),OpenVMS)
|
|||
# Our assembler wants the include file to be of assembler syntax, not C/C++
|
||||
# syntax, so we have to massage it slightly.
|
||||
|
||||
$(OBJDIR)/xptcstubs_asm_openvms_alpha.o: $(PUBLIC)/xptcstubsdef.inc $(srcdir)/xptcstubs_asm_openvms_alpha.s
|
||||
xptcstubs_asm_openvms_alpha.o: $(PUBLIC)/xptcstubsdef.inc $(srcdir)/xptcstubs_asm_openvms_alpha.s
|
||||
@rm -f ./xptcstubsdef_asm.vms
|
||||
@awk ' \
|
||||
/^.*_ENTRY\([0-9]+\)/ { \
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче