mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-25 13:51:41 +00:00
Build fixes based upon Ron's original mega-patch.
This commit is contained in:
parent
d15e50fa60
commit
3b8374aa75
@ -124,12 +124,12 @@ ifdef MOZ_JPROF
|
|||||||
DIRS += tools/jprof
|
DIRS += tools/jprof
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
DIRS += xpinstall
|
||||||
|
|
||||||
ifdef MOZ_BUILD_XPFE
|
ifdef MOZ_BUILD_XPFE
|
||||||
DIRS += xpfe
|
DIRS += xpfe
|
||||||
endif
|
endif
|
||||||
|
|
||||||
DIRS += xpinstall
|
|
||||||
|
|
||||||
ifdef MOZ_PSM
|
ifdef MOZ_PSM
|
||||||
DIRS += security/nss security/manager
|
DIRS += security/nss security/manager
|
||||||
endif
|
endif
|
||||||
@ -160,6 +160,8 @@ ifdef MOZ_STATIC_COMPONENTS
|
|||||||
DIRS += modules/staticmod
|
DIRS += modules/staticmod
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
DIRS += xpfe/bootstrap
|
||||||
|
|
||||||
endif # BUILD_MODULES == all
|
endif # BUILD_MODULES == all
|
||||||
|
|
||||||
STATIC_MAKEFILES := $(NSPRPUB_DIR) directory/c-sdk/ldap
|
STATIC_MAKEFILES := $(NSPRPUB_DIR) directory/c-sdk/ldap
|
||||||
|
@ -378,7 +378,7 @@ endif
|
|||||||
|
|
||||||
DEPENDENCIES = .md
|
DEPENDENCIES = .md
|
||||||
|
|
||||||
MOZ_COMPONENT_LIBS=$(MOZ_COMPONENT_NSPR_LIBS) $(MOZ_COMPONENT_XPCOM_LIBS)
|
MOZ_COMPONENT_LIBS=$(MOZ_COMPONENT_XPCOM_LIBS) $(MOZ_COMPONENT_NSPR_LIBS)
|
||||||
|
|
||||||
ifdef GC_LEAK_DETECTOR
|
ifdef GC_LEAK_DETECTOR
|
||||||
MOZ_COMPONENT_XPCOM_LIBS += -lboehm
|
MOZ_COMPONENT_XPCOM_LIBS += -lboehm
|
||||||
|
@ -62,7 +62,9 @@ CFLAGS += $(TK_CFLAGS)
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
install-plugin: $(SHARED_LIBRARY)
|
install-plugin: $(SHARED_LIBRARY)
|
||||||
|
ifdef SHARED_LIBRARY
|
||||||
$(INSTALL) $(SHARED_LIBRARY) $(DIST)/bin/plugins
|
$(INSTALL) $(SHARED_LIBRARY) $(DIST)/bin/plugins
|
||||||
|
endif
|
||||||
|
|
||||||
install:: install-plugin
|
install:: install-plugin
|
||||||
|
|
||||||
|
@ -62,7 +62,9 @@ CFLAGS += $(TK_CFLAGS)
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
install-plugin: $(SHARED_LIBRARY)
|
install-plugin: $(SHARED_LIBRARY)
|
||||||
|
ifdef SHARED_LIBRARY
|
||||||
$(INSTALL) $(SHARED_LIBRARY) $(DIST)/bin/plugins
|
$(INSTALL) $(SHARED_LIBRARY) $(DIST)/bin/plugins
|
||||||
|
endif
|
||||||
|
|
||||||
install:: install-plugin
|
install:: install-plugin
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@ VPATH = @srcdir@
|
|||||||
|
|
||||||
include $(DEPTH)/config/autoconf.mk
|
include $(DEPTH)/config/autoconf.mk
|
||||||
|
|
||||||
DIRS = appshell bootstrap browser communicator components global
|
DIRS = appshell components browser communicator global
|
||||||
|
|
||||||
include $(topsrcdir)/config/rules.mk
|
include $(topsrcdir)/config/rules.mk
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user