Fix TestWindowsDND bustage (fallout from fakelibs)
authorKyle Huey <me@kylehuey.com>
Mon, 02 Aug 2010 00:08:38 -0700
changeset 48704 b838fb5b878d86524e4f669596639e995c9961c5
parent 48703 78aa896bdf376c7fa952a2c5b39caa1bac8b3442
child 48705 f3a152ea587afc0ecac829e17a68c01c4efaf300
push id14775
push userme@kylehuey.com
push dateMon, 02 Aug 2010 07:11:50 +0000
treeherdermozilla-central@b838fb5b878d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone2.0b3pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Fix TestWindowsDND bustage (fallout from fakelibs)
config/rules.mk
js/src/config/rules.mk
widget/src/windows/tests/Makefile.in
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -894,17 +894,17 @@ ifdef IS_COMPONENT
 else
 	$(INSTALL) $(IFLAGS1) $(LIBRARY) $(FAKE_LIBRARY) $(DEPTH)/staticlib
 endif
 endif # EXPORT_LIBRARY
 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
 ifdef SHARED_LIBRARY
 ifdef IS_COMPONENT
 	$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(FINAL_TARGET)/components
 	$(ELF_DYNSTR_GC) $(FINAL_TARGET)/components/$(SHARED_LIBRARY)
 ifndef NO_COMPONENTS_MANIFEST
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -894,17 +894,17 @@ ifdef IS_COMPONENT
 else
 	$(INSTALL) $(IFLAGS1) $(LIBRARY) $(FAKE_LIBRARY) $(DEPTH)/staticlib
 endif
 endif # EXPORT_LIBRARY
 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
 ifdef SHARED_LIBRARY
 ifdef IS_COMPONENT
 	$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(FINAL_TARGET)/components
 	$(ELF_DYNSTR_GC) $(FINAL_TARGET)/components/$(SHARED_LIBRARY)
 ifndef NO_COMPONENTS_MANIFEST
--- a/widget/src/windows/tests/Makefile.in
+++ b/widget/src/windows/tests/Makefile.in
@@ -44,20 +44,24 @@ include $(DEPTH)/config/autoconf.mk
 
 ifndef MOZ_ENABLE_LIBXUL
 LOCAL_INCLUDES =  -I$(srcdir)/../   \
                   -I$(srcdir)/../../xpwidgets \
                   $(NULL)
 
 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)
 endif 
 
 include $(topsrcdir)/config/rules.mk