From 552b7a310eeec09cb916113673a2a75054ac9a48 Mon Sep 17 00:00:00 2001 From: Neil Rashbrook Date: Sun, 31 Aug 2008 16:11:19 +0200 Subject: [PATCH] bug 450781 - make xpfe autocomplete build with |--enable-libxul| and build it from build.mk, r=Callek, a=NPOTB for Firefox --- xpfe/components/Makefile.in | 4 ---- xpfe/components/autocomplete/src/Makefile.in | 5 ++--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/xpfe/components/Makefile.in b/xpfe/components/Makefile.in index b3a2f1c89450..c81e80f0d7c9 100644 --- a/xpfe/components/Makefile.in +++ b/xpfe/components/Makefile.in @@ -52,10 +52,6 @@ DIRS += \ $(NULL) endif -ifneq (,$(MOZ_THUNDERBIRD)$(MOZ_SUITE)$(MOZ_SUNBIRD)) -DIRS += autocomplete -endif - # build should be last DIRS += \ directory \ diff --git a/xpfe/components/autocomplete/src/Makefile.in b/xpfe/components/autocomplete/src/Makefile.in index 630547c055b6..794457290871 100644 --- a/xpfe/components/autocomplete/src/Makefile.in +++ b/xpfe/components/autocomplete/src/Makefile.in @@ -46,15 +46,14 @@ MODULE = appcomps MODULE_NAME = xpAutoComplete LIBRARY_NAME = xpautocomplete SHORT_LIBNAME = xpautoc -MOZILLA_INTERNAL_API = 1 +MOZILLA_INTERNAL_API = $(BUILD_STATIC_LIBS) EXPORT_LIBRARY = 1 IS_COMPONENT = 1 - CPPSRCS = nsAutoComplete.cpp EXTRA_DSO_LDOPTS += \ - $(MOZ_UNICHARUTIL_LIBS) \ + $(XPCOM_GLUE_LDOPTS) \ $(MOZ_COMPONENT_LIBS) \ $(NULL)