зеркало из https://github.com/mozilla/gecko-dev.git
Родитель
d760f564c8
Коммит
34476449c2
|
@ -79,9 +79,7 @@ endif
|
|||
|
||||
export:: $(TARGETS) $(HEADERS)
|
||||
$(INSTALL) -m 444 $(HEADERS) $(DIST)/include
|
||||
ifdef MOZ_TRACK_MODULE_DEPS
|
||||
$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(PUBLIC)/.headerlist $(HEADERS)
|
||||
endif
|
||||
-rm -f $(FINAL_LINK_COMPS) $(FINAL_LINK_LIBS) $(FINAL_LINK_COMP_NAMES)
|
||||
|
||||
GARBAGE += build_number nsBuildID.h
|
||||
|
|
|
@ -30,7 +30,6 @@ DIST = $(DEPTH)/dist
|
|||
|
||||
MOZ_DISABLE_JAR_PACKAGING = @MOZ_DISABLE_JAR_PACKAGING@
|
||||
MOZ_CHROME_FILE_FORMAT = @MOZ_CHROME_FILE_FORMAT@
|
||||
MOZ_TRACK_MODULE_DEPS = @MOZ_TRACK_MODULE_DEPS@
|
||||
|
||||
MOZ_WIDGET_TOOLKIT = @MOZ_WIDGET_TOOLKIT@
|
||||
MOZ_GFX_TOOLKIT = $(MOZ_WIDGET_TOOLKIT)
|
||||
|
|
|
@ -71,7 +71,7 @@ WINOS=$(WINOS: =)^
|
|||
#//-----------------------------------------------------------------------
|
||||
|
||||
XPDIST=$(DEPTH)\dist
|
||||
!if defined(MOZ_TRACK_MODULE_DEPS) && defined(MODULE)
|
||||
!ifdef MODULE
|
||||
PUBLIC=$(XPDIST)\include\$(MODULE)
|
||||
!else
|
||||
PUBLIC=$(XPDIST)\include
|
||||
|
|
|
@ -407,9 +407,7 @@ JAVA_OPTIMIZER = -g
|
|||
XBCFLAGS = -FR$*
|
||||
endif
|
||||
|
||||
ifdef MOZ_TRACK_MODULE_DEPS
|
||||
REQ_INCLUDES = $(foreach d,$(REQUIRES),-I$(DIST)/include/$d)
|
||||
endif
|
||||
|
||||
INCLUDES = $(LOCAL_INCLUDES) $(REQ_INCLUDES) -I$(PUBLIC) -I$(DIST)/include $(OS_INCLUDES)
|
||||
|
||||
|
@ -464,7 +462,7 @@ endif
|
|||
LIBS_DIR = -L$(DIST)/bin -L$(DIST)/lib
|
||||
|
||||
# Default location of include files
|
||||
ifdef MOZ_TRACK_MODULE_DEPS
|
||||
ifdef MODULE
|
||||
PUBLIC = $(DIST)/include/$(MODULE)
|
||||
else
|
||||
PUBLIC = $(DIST)/include
|
||||
|
|
|
@ -711,9 +711,7 @@ include <$(DEPTH)/config/java.inc>
|
|||
export:: $(EXPORTS)
|
||||
@echo +++ make: exporting headers
|
||||
$(MAKE_INSTALL:/=\) $(MKCPYFLAGS) $(EXPORTS) $(PUBLIC)
|
||||
!ifdef MOZ_TRACK_MODULE_DEPS
|
||||
$(PERL) -I$(DEPTH)\config $(DEPTH)\config\build-list.pl $(PUBLIC)/.headerlist $(EXPORTS)
|
||||
!endif
|
||||
|
||||
#// don't delete exported stuff on a local clobber, use clobber_all
|
||||
#clobber::
|
||||
|
@ -820,9 +818,7 @@ export:: $(XPDIST)\idl
|
|||
export:: $(XPIDL_GEN_DIR) $(XPIDL_HEADERS) $(PUBLIC)
|
||||
@echo +++ make: exporting generated XPIDL header files
|
||||
$(MAKE_INSTALL) $(XPIDL_HEADERS:/=\) $(PUBLIC)
|
||||
!ifdef MOZ_TRACK_MODULE_DEPS
|
||||
$(PERL) -I$(DEPTH)\config $(DEPTH)\config\build-list.pl $(PUBLIC)/.headerlist $(XPIDL_HEADERS)
|
||||
!endif
|
||||
|
||||
!ifndef NO_GEN_XPT
|
||||
install:: $(XPIDL_GEN_DIR) $(TYPELIB)
|
||||
|
|
|
@ -1174,9 +1174,7 @@ endif
|
|||
ifneq ($(EXPORTS),)
|
||||
export:: $(EXPORTS) $(PUBLIC)
|
||||
$(INSTALL) $(IFLAGS1) $^
|
||||
ifdef MOZ_TRACK_MODULE_DEPS
|
||||
$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(PUBLIC)/.headerlist $(notdir $(filter-out $(PUBLIC),$^))
|
||||
endif
|
||||
endif
|
||||
|
||||
################################################################################
|
||||
|
@ -1233,9 +1231,7 @@ $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_COMPILE) $(XPIDL_GEN_DIR)/.done
|
|||
|
||||
export:: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(XPIDLSRCS)) $(PUBLIC)
|
||||
$(INSTALL) $(IFLAGS1) $^
|
||||
ifdef MOZ_TRACK_MODULE_DEPS
|
||||
$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(PUBLIC)/.headerlist $(notdir $(filter-out $(PUBLIC),$^))
|
||||
endif
|
||||
|
||||
ifndef NO_GEN_XPT
|
||||
# generate intermediate .xpt files into $(XPIDL_GEN_DIR), then link
|
||||
|
|
|
@ -4026,7 +4026,6 @@ dnl =
|
|||
dnl = Maintainer debug option (no --enable equivalent)
|
||||
dnl =
|
||||
dnl ========================================================
|
||||
AC_SUBST(MOZ_TRACK_MODULE_DEPS)
|
||||
|
||||
AC_SUBST(AR)
|
||||
AC_SUBST(AR_FLAGS)
|
||||
|
|
Загрузка…
Ссылка в новой задаче