putting these changes back since the problem was with configure

git-svn-id: svn://10.0.0.236/trunk@162005 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
darin%meer.net 2004-09-09 19:44:19 +00:00
parent c904b2ef29
commit bca6a46767

View File

@ -76,8 +76,10 @@ REQUIRES = xpcom \
$(NULL)
ifndef MOZ_PHOENIX
ifndef MOZ_XULRUNNER
REQUIRES += history downloadmanager
endif
endif
CPPSRCS = nsModule.cpp
@ -99,6 +101,7 @@ SHARED_LIBRARY_LIBS = \
$(NULL)
ifndef MOZ_PHOENIX
ifndef MOZ_XULRUNNER
SHARED_LIBRARY_LIBS += \
$(DIST)/lib/$(LIB_PREFIX)autocomplete_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)bookmarks_s.$(LIB_SUFFIX) \
@ -115,6 +118,7 @@ SHARED_LIBRARY_LIBS += \
$(NULL)
endif
endif
endif
LOCAL_INCLUDES = \
@ -125,6 +129,7 @@ LOCAL_INCLUDES = \
$(NULL)
ifndef MOZ_PHOENIX
ifndef MOZ_XULRUNNER
LOCAL_INCLUDES += \
-I$(srcdir)/../autocomplete/src \
-I$(srcdir)/../bookmarks/src \
@ -141,6 +146,7 @@ LOCAL_INCLUDES += \
$(NULL)
endif
endif
endif
ifeq ($(OS_ARCH),WINNT)