Fix TestWindowsDND bustage (fallout from fakelibs)

--HG--
extra : rebase_source : e64dd9e1ad4e60ad2a1fe8968c309b13726760bd
This commit is contained in:
Kyle Huey 2010-08-02 00:08:38 -07:00
Родитель fb8b4e01a8
Коммит 1ab31bac86
3 изменённых файлов: 7 добавлений и 3 удалений

Просмотреть файл

@ -899,7 +899,7 @@ ifdef DIST_INSTALL
ifdef IS_COMPONENT
$(error Shipping static component libs makes no sense.)
else
$(INSTALL) $(IFLAGS1) $(LIBRARY) $(FAKE_LIBRARY) $(DIST)/lib
$(INSTALL) $(IFLAGS1) $(LIBRARY) $(DIST)/lib
endif
endif # DIST_INSTALL
endif # LIBRARY

Просмотреть файл

@ -899,7 +899,7 @@ ifdef DIST_INSTALL
ifdef IS_COMPONENT
$(error Shipping static component libs makes no sense.)
else
$(INSTALL) $(IFLAGS1) $(LIBRARY) $(FAKE_LIBRARY) $(DIST)/lib
$(INSTALL) $(IFLAGS1) $(LIBRARY) $(DIST)/lib
endif
endif # DIST_INSTALL
endif # LIBRARY

Просмотреть файл

@ -49,12 +49,16 @@ LOCAL_INCLUDES = -I$(srcdir)/../ \
LIBS = ../$(LIB_PREFIX)widget_windows.$(LIB_SUFFIX) \
../../xpwidgets/$(LIB_PREFIX)xpwidgets_s.$(LIB_SUFFIX) \
gkgfx \
thebes \
$(DIST)/lib/$(LIB_PREFIX)thebes.$(LIB_SUFFIX) \
$(XPCOM_LIBS) \
$(MOZ_UNICHARUTIL_LIBS) \
$(NULL)
OS_LIBS += $(call EXPAND_LIBNAME,ole32 shell32)
EXTRA_DSO_LDOPTS += $(LIBS_DIR)
OS_LIBS += $(call EXPAND_LIBNAME,ole32 shell32 comctl32 comdlg32 imm32 shlwapi winspool)
CPP_UNIT_TESTS = TestWinDND.cpp \
$(NULL)