Bug 485073 - OS/2 enable test plugin equivalent to other platforms; build the common test plugin on OS/2 also on branch; r=Weilbacher
authorWalter Meinl <wuno@lsvw.de>
Fri, 05 Jun 2009 03:10:55 +0200
changeset 25873 5cd96b6afea3f67253657e6d4dd1e1e54849e3f6
parent 25872 3bab31a7104fc464bbe1f34386412cd6e38cd6c0
child 25874 9f212010c4d238c9e643439dcdb6f3fabceb35e0
push id1648
push usersgautherie.bz@free.fr
push dateFri, 05 Jun 2009 01:12:09 +0000
reviewersWeilbacher
bugs485073
milestone1.9.1pre
Bug 485073 - OS/2 enable test plugin equivalent to other platforms; build the common test plugin on OS/2 also on branch; r=Weilbacher
modules/plugin/Makefile.in
modules/plugin/sdk/Makefile.in
--- a/modules/plugin/Makefile.in
+++ b/modules/plugin/Makefile.in
@@ -63,28 +63,25 @@ endif
 ifeq ($(OS_ARCH),WINNT)
 TOOL_DIRS += default/windows
 endif
 
 ifeq ($(OS_ARCH),OS2)
 TOOL_DIRS += default/os2
 ifdef MOZ_OJI
 TOOL_DIRS += os2wrapper
-ifdef ENABLE_TESTS
-TOOL_DIRS += tools/tester/common tools/tester/os2
-endif
 endif
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 TOOL_DIRS += default/mac
 endif
 
 ifdef ENABLE_TESTS
-ifneq (,$(filter WINNT Darwin Linux,$(OS_ARCH)))
+ifneq (,$(filter WINNT Darwin Linux OS2,$(OS_ARCH)))
 TOOL_DIRS += sdk
 endif
 DIRS += test
 endif
 
 endif # MOZ_PLUGINS
 
 include $(topsrcdir)/config/rules.mk
--- a/modules/plugin/sdk/Makefile.in
+++ b/modules/plugin/sdk/Makefile.in
@@ -45,16 +45,16 @@ include $(DEPTH)/config/autoconf.mk
 
 DIRS = samples
 
 # uncomment NSDISTMODE to make a copy, instead of symlink, all needed files from $(DIST) 
 # NSDISTMODE = copy
 
 include $(topsrcdir)/config/rules.mk
 
-ifeq ($(OS_ARCH),WINNT)
+ifneq (,$(filter WINNT OS2,$(OS_ARCH)))
 PROG_SUFFIX = .exe
 else
 PROG_SUFFIX =
 endif
 
 clobber::
 	$(RM) -r bin idl include