More OS/2 Makefile changes. Bug #34106 Batch 13

2000-05-11 14:15:34 +00:00 · 2000-05-11 14:15:34 +00:00 · 5be082e304
--- a/dbm/tests/Makefile.in
+++ b/dbm/tests/Makefile.in
@ -27,11 +27,13 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= dbm
-PROGRAM		= lots
+PROGRAM		= lots$(BIN_SUFFIX)

 CSRCS		= lots.c

-LIBS		= -lmozdbm_s
+EXTRA_DSO_LIBS	= mozdbm_s
+
+LIBS		= $(EXTRA_DSO_LIBS) 

 include $(topsrcdir)/config/rules.mk

--- a/extensions/cookie/tests/Makefile.in
+++ b/extensions/cookie/tests/Makefile.in
@ -26,7 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-PROGRAM		= TestCookie
+PROGRAM		= TestCookie$(BIN_SUFFIX)
 CPPSRCS		= TestCookie.cpp

 REQUIRES	= js cookie pref xpcom include
--- a/gfx/tests/Makefile.in
+++ b/gfx/tests/Makefile.in
@ -32,12 +32,18 @@ CPPSRCS		= \
 		TestRect.cpp \
 		$(NULL)

-SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=)
+SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=$(BIN_SUFFIX))
+
+ifeq ($(USE_SHORT_LIBNAME),1)
+EXTRA_DSO_LIBS	= nggfx
+else
+EXTRA_DSO_LIBS	= raptorgfx
+endif

 LIBS		= \
-		-lraptorgfx \
+		$(EXTRA_DSO_LIBS) \
 		$(XPCOM_LIBS) \
-		-lmozjs \
+		$(MOZ_JS_LIBS) \
 		$(MOZ_TIMER_LIBS) \
 		$(TK_LIBS) \
 		$(NSPR_LIBS) \
--- a/htmlparser/robot/test/Makefile.in
+++ b/htmlparser/robot/test/Makefile.in
@ -39,7 +39,7 @@ EXTRA_DSO_LIBS = DebugRobot
 endif

 LIBS		= \
-		-lDebugRobot \
+		$(EXTRA_DSO_LIBS) \
 		$(LOST_SYM_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
--- a/htmlparser/tests/outsinks/Makefile.in
+++ b/htmlparser/tests/outsinks/Makefile.in
@ -26,7 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-PROGRAM		= TestOutput
+PROGRAM		= TestOutput$(BIN_SUFFIX)

 CPPSRCS		= \
 		Convert.cpp \
@ -35,7 +35,7 @@ CPPSRCS		= \

 LIBS		= \
 		$(XPCOM_LIBS) \
-		-lmozjs \
+		$(MOZ_JS_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)

@ -62,6 +62,7 @@ TEST_FILES      = \
 include $(topsrcdir)/config/rules.mk

 install:: 
+	$(INSTALL) -m 555 $(srcdir)/TestOutSinks $(DIST)/bin
 	$(INSTALL) -m 555 $(srcdir)/TestOutSinks.pl $(DIST)/bin
 	$(INSTALL) $(addprefix $(srcdir)/, $(TEST_FILES)) $(DIST)/bin/OutTestData

--- a/intl/lwbrk/tests/Makefile.in
+++ b/intl/lwbrk/tests/Makefile.in
@ -26,7 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-PROGRAM		= TestLineBreak
+PROGRAM		= TestLineBreak$(BIN_SUFFIX)

 CPPSRCS		= TestLineBreak.cpp

--- a/intl/strres/tests/Makefile.in
+++ b/intl/strres/tests/Makefile.in
@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk

 CPPSRCS		= StringBundleTest.cpp

-SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=)
+SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=$(BIN_SUFFIX))

 EXPORT_RESOURCE	= \
 		$(srcdir)/strres.properties \
@ -39,7 +39,7 @@ EXPORT_RESOURCE	= \
 		$(NULL)

 LIBS		= \
-		-lmozjs \
+		$(MOZ_JS_LIBS) \
 		$(XPCOM_LIBS) \
 		$(MOZ_TIMER_LIBS) \
 		$(NSPR_LIBS) \
--- a/intl/unicharutil/tests/Makefile.in
+++ b/intl/unicharutil/tests/Makefile.in
@ -26,7 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-PROGRAM		= UnicharSelfTest
+PROGRAM		= UnicharSelfTest$(BIN_SUFFIX)

 CPPSRCS		= UnicharSelfTest.cpp 

--- a/mailnews/base/tests/Makefile.in
+++ b/mailnews/base/tests/Makefile.in
@ -27,7 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= msgbasetest
-PROGRAM		= testmailnews
+PROGRAM		= testmailnews$(BIN_SUFFIX)

 DIRS		= accountmanager

--- a/mailnews/compose/tests/compose/Makefile.in
+++ b/mailnews/compose/tests/compose/Makefile.in
@ -26,12 +26,18 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-PROGRAM		= TestMSGCompose
+PROGRAM		= TestMSGCompose$(BIN_SUFFIX)

 CPPSRCS		= test.cpp

+ifeq ($(USE_SHORT_LIBNAME),1)
+EXTRA_DSO_LIBS	= msgbutil
+else
+EXTRA_DSO_LIBS	= msgbaseutil
+endif
+
 LIBS		= \
-		-lmsgbaseutil \
+		$(EXTRA_DSO_LIBS) \
 		$(XPCOM_LIBS) \
 		$(MOZ_TIMER_LIBS) \
 		$(NSPR_LIBS) \
--- a/mailnews/compose/tests/compose2/Makefile.in
+++ b/mailnews/compose/tests/compose2/Makefile.in
@ -26,17 +26,22 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-PROGRAM		= msgcomposetest2
+PROGRAM		= msgcomposetest2$(BIN_SUFFIX)

 CPPSRCS		= test2.cpp

+ifeq ($(USE_SHORT_LIBNAME),1)
+EXTRA_DSO_LIBS	= nggfx msgbutil
+else
+EXTRA_DSO_LIBS	= raptorgfx msgbaseutil
+endif
+
 LIBS		= \
 		$(MOZ_TIMER_LIBS) \
 		$(NSPR_LIBS)	\
 		$(XPCOM_LIBS) \
-		-lmozjs \
-		-lraptorgfx \
-		-lmsgbaseutil \
+		$(MOZ_JS_LIBS) \
+		$(EXTRA_DSO_LIBS) \
 		$(NULL)

 # The Timer libs for Photon/Neutrino require the Toolkit libs to also be linked
--- a/mailnews/compose/tests/geturl/Makefile.in
+++ b/mailnews/compose/tests/geturl/Makefile.in
@ -26,7 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-PROGRAM		= geturl
+PROGRAM		= geturl$(BIN_SUFFIX)

 CPPSRCS		= \
 		geturl.cpp \
@ -36,7 +36,7 @@ CPPSRCS		= \
 LIBS = \
 		$(MOZ_TIMER_LIBS) \
 		$(XPCOM_LIBS) \
-		-lmozjs \
+		$(MOZ_JS_LIBS) \
 		$(NSPR_LIBS) \
 		$(TK_LIBS) \
 		$(NULL)
--- a/mailnews/compose/tests/sendlater/Makefile.in
+++ b/mailnews/compose/tests/sendlater/Makefile.in
@ -26,16 +26,21 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-PROGRAM		= sendlatertest
+PROGRAM		= sendlatertest$(BIN_SUFFIX)

 CPPSRCS		= test.cpp

+ifeq ($(USE_SHORT_LIBNAME),1)
+EXTRA_DSO_LIBS	= nggfx msgbutil
+else
+EXTRA_DSO_LIBS	= raptorgfx msgbaseutil
+endif
+
 LIBS		= \
 		$(MOZ_TIMER_LIBS) \
-		-lraptorgfx \
+		$(EXTRA_DSO_LIBS) \
 		$(XPCOM_LIBS) \
-		-lmozjs \
-		-lmsgbaseutil \
+		$(MOZ_JS_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)

--- a/mailnews/compose/tests/sendpage/Makefile.in
+++ b/mailnews/compose/tests/sendpage/Makefile.in
@ -26,15 +26,21 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-PROGRAM		= sendpage
+PROGRAM		= sendpage$(BIN_SUFFIX)

 CPPSRCS		= Test.cpp

+ifeq ($(USE_SHORT_LIBNAME),1)
+EXTRA_DSO_LIBS	= msgbutil
+else
+EXTRA_DSO_LIBS	= msgbaseutil
+endif
+
 LIBS		= \
 		$(MOZ_TIMER_LIBS) \
+		$(EXTRA_DSO_LIBS) \
 		$(XPCOM_LIBS) \
-		-lmozjs \
-		-lmsgbaseutil \
+		$(MOZ_JS_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)

--- a/mailnews/imap/tests/harness/Makefile.in
+++ b/mailnews/imap/tests/harness/Makefile.in
@ -27,14 +27,20 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= msgimaptest
-PROGRAM		= testimap
+PROGRAM		= testimap$(BIN_SUFFIX)

 CPPSRCS		= imapProtocolTest.cpp

+ifeq ($(USE_SHORT_LIBNAME),1)
+EXTRA_DSO_LIBS	= msgbutil
+else
+EXTRA_DSO_LIBS	= msgbaseutil
+endif
+
 LIBS =	\
 		-L$(DIST)/bin \
 		$(XPCOM_LIBS) \
-		-lmsgbaseutil \
+		$(EXTRA_DSO_LIBS) \
 		$(MOZ_TIMER_LIBS) \
 		$(NSPR_LIBS) \
 		$(TK_LIBS) \
--- a/mailnews/local/tests/pop3/Makefile.in
+++ b/mailnews/local/tests/pop3/Makefile.in
@ -26,11 +26,17 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-PROGRAM		= pop3Test
+PROGRAM		= pop3Test$(BIN_SUFFIX)
 CPPSRCS		= pop3Test.cpp

+ifeq ($(USE_SHORT_LIBNAME),1)
+EXTRA_DSO_LIBS	= msgbutil
+else
+EXTRA_DSO_LIBS	= msgbaseutil
+endif
+
 LIBS		= \
-		-lmsgbaseutil \
+		$(EXTRA_DSO_LIBS) \
 		$(XPCOM_LIBS) \
 		$(MOZ_TIMER_LIBS) \
 		$(NSPR_LIBS) \
--- a/netwerk/streamconv/test/Makefile.in
+++ b/netwerk/streamconv/test/Makefile.in
@ -27,7 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= TestStreamConv
-PROGRAM		= TestStreamConv
+PROGRAM		= TestStreamConv$(BIN_SUFFIX)

 REQUIRES	= libreg xpcom

--- a/netwerk/test/Makefile.in
+++ b/netwerk/test/Makefile.in
@ -40,7 +40,7 @@ CPPSRCS		= \
 		TestCallbacks.cpp \
 		$(NULL)

-SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=)
+SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=$(BIN_SUFFIX))

 include $(topsrcdir)/config/config.mk

@ -53,6 +53,7 @@ LOST_SYM_LIBS	= -lxpcomds_s -lxpcomio_s -lxptinfo -lmozreg_s
 endif

 LIBS		= \
+		$(MOZ_JS_LIBS) \
 		$(XPCOM_LIBS) \
 		$(LOST_SYM_LIBS) \
 		$(NSPR_LIBS) \
--- a/parser/htmlparser/robot/test/Makefile.in
+++ b/parser/htmlparser/robot/test/Makefile.in
@ -39,7 +39,7 @@ EXTRA_DSO_LIBS = DebugRobot
 endif

 LIBS		= \
-		-lDebugRobot \
+		$(EXTRA_DSO_LIBS) \
 		$(LOST_SYM_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
--- a/parser/htmlparser/tests/outsinks/Makefile.in
+++ b/parser/htmlparser/tests/outsinks/Makefile.in
@ -26,7 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-PROGRAM		= TestOutput
+PROGRAM		= TestOutput$(BIN_SUFFIX)

 CPPSRCS		= \
 		Convert.cpp \
@ -35,7 +35,7 @@ CPPSRCS		= \

 LIBS		= \
 		$(XPCOM_LIBS) \
-		-lmozjs \
+		$(MOZ_JS_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)

@ -62,6 +62,7 @@ TEST_FILES      = \
 include $(topsrcdir)/config/rules.mk

 install:: 
+	$(INSTALL) -m 555 $(srcdir)/TestOutSinks $(DIST)/bin
 	$(INSTALL) -m 555 $(srcdir)/TestOutSinks.pl $(DIST)/bin
 	$(INSTALL) $(addprefix $(srcdir)/, $(TEST_FILES)) $(DIST)/bin/OutTestData

--- a/rdf/tests/rdfcat/Makefile.in
+++ b/rdf/tests/rdfcat/Makefile.in
@ -26,12 +26,12 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-PROGRAM		= rdfcat
+PROGRAM		= rdfcat$(BIN_SUFFIX)
 CPPSRCS		= rdfcat.cpp

 LIBS		= \
 		$(MOZ_TIMER_LIBS) \
-		-lmozjs \
+		$(MOZ_JS_LIBS) \
 		$(XPCOM_LIBS) \
 		$(NSPR_LIBS) \
 		$(TK_LIBS) \
--- a/rdf/tests/rdfpoll/Makefile.in
+++ b/rdf/tests/rdfpoll/Makefile.in
@ -26,12 +26,12 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-PROGRAM		= rdfpoll
+PROGRAM		= rdfpoll$(BIN_SUFFIX)
 CPPSRCS		= rdfpoll.cpp

 LIBS		= \
 		$(MOZ_TIMER_LIBS) \
-		-lmozjs \
+		$(MOZ_JS_LIBS) \
 		$(XPCOM_LIBS) \
 		$(TK_LIBS) \
 		$(LOST_SYM_LIBS) \
--- a/xpcom/proxy/tests/Makefile.in
+++ b/xpcom/proxy/tests/Makefile.in
@ -31,8 +31,7 @@ MODULE		= proxytest
 CPPSRCS		= proxytests.cpp
 XPIDLSRCS	= nsITestProxy.idl

-SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=)
-
+SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=$(BIN_SUFFIX)) 
 ifdef NO_LD_ARCHIVE_FLAGS
 LOST_SYM_LIBS	= -lxpcomds_s -lxptinfo -lmozreg_s
 endif
--- a/xpcom/reflect/xptcall/tests/Makefile.in
+++ b/xpcom/reflect/xptcall/tests/Makefile.in
@ -27,7 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= TestXPTC
-SIMPLE_PROGRAMS	= TestXPTCInvoke
+SIMPLE_PROGRAMS	= TestXPTCInvoke$(BIN_SUFFIX)

 CPPSRCS		= TestXPTCInvoke.cpp

--- a/xpcom/reflect/xptinfo/tests/Makefile.in
+++ b/xpcom/reflect/xptinfo/tests/Makefile.in
@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= xpcom

-SIMPLE_PROGRAMS	= TestInterfaceInfo
+SIMPLE_PROGRAMS	= TestInterfaceInfo$(BIN_SUFFIX)

 CPPSRCS		= TestInterfaceInfo.cpp

--- a/xpcom/tests/Makefile.in
+++ b/xpcom/tests/Makefile.in
@ -48,7 +48,7 @@ CPPSRCS		= \
 		TestThreads.cpp \
 		$(NULL)

-SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=)
+SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=$(BIN_SUFFIX))

 include $(topsrcdir)/config/config.mk

@ -70,7 +70,7 @@ endif

 LIBS		+= \
 		$(MOZ_TIMER_LIBS) \
-		-lmozjs \
+		$(MOZ_JS_LIBS) \
 		$(XPCOM_LIBS) \
 		$(TK_LIBS) \
 		$(LOST_SYM_LIBS) \
--- a/xpcom/tests/dynamic/Makefile.in
+++ b/xpcom/tests/dynamic/Makefile.in
@ -27,9 +27,12 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME	= testdynamic
+SHORT_LIBNAME	= tdynamic

 CPPSRCS		= TestDynamic.cpp

+include $(topsrcdir)/config/config.mk
+
 LOCAL_INCLUDES	= -I$(srcdir)/.. -I$(srcdir)/../../public

 include $(topsrcdir)/config/rules.mk
--- a/xpcom/tests/services/Makefile.in
+++ b/xpcom/tests/services/Makefile.in
@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk

 IS_COMPONENT	= 1
 LIBRARY_NAME	= MyService
+SHORT_LIBNAME	= MyServce

 CPPSRCS		= MyService.cpp

--- a/xpcom/typelib/xpt/tests/Makefile.in
+++ b/xpcom/typelib/xpt/tests/Makefile.in
@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= xpcom
 CPP_PROG_LINK	= 1

-SIMPLE_PROGRAMS	= PrimitiveTest SimpleTypeLib
+SIMPLE_PROGRAMS	= PrimitiveTest$(BIN_SUFFIX) SimpleTypeLib$(BIN_SUFFIX)

 CSRCS		= PrimitiveTest.c SimpleTypeLib.c