Define the toolkit flags in one place an reuse that. Hopefully this will

put an end to the cut-n-paste insanity.
1999-07-07 04:38:18 +00:00 · 1999-07-07 04:38:18 +00:00 · abf0cc4a0f
--- a/gfx/tests/Makefile.in
+++ b/gfx/tests/Makefile.in
@ -57,8 +57,8 @@ NET_LIBS =		\
 endif

 LIBS = \
-	-lraptorgfx \
-	-lgfx$(MOZ_GFX_TOOLKIT) \
+	-lraptorgfx 	\
+	$(MOZ_GFX_TOOLKIT_LDFLAGS) \
 	$(TK_LIBS) \
 	-lxpcom \
 	-lreg \
--- a/htmlparser/robot/Makefile.in
+++ b/htmlparser/robot/Makefile.in
@ -54,8 +54,8 @@ LIBS		= \
 		-lhttpurl \
 		-lpwcac \
 		-l$(MOZ_LIB_JS_PREFIX)js \
-		-lgfx$(MOZ_GFX_TOOLKIT) \
-		-lraptorgfx \
+		-lraptorgfx 	\
+		$(MOZ_GFX_TOOLKIT_LDFLAGS) \
 		-limg	\
 		-lmozutil \
 		-lxpcom \
--- a/layout/html/tests/Makefile.in
+++ b/layout/html/tests/Makefile.in
@ -65,8 +65,8 @@ LIBS = \
 	-lsecfree \
 	-l$(MOZ_LIB_JS_PREFIX)js \
 	-ljsdom \
-	-lraptorgfx \
-	-lgfx$(MOZ_GFX_TOOLKIT) \
+	-lraptorgfx 	\
+	$(MOZ_GFX_TOOLKIT_LDFLAGS) \
 	-lxpcom \
 	-lxp \
 	-lraptorhtmlpars \
--- a/mailnews/base/tests/identity/Makefile.in
+++ b/mailnews/base/tests/identity/Makefile.in
@ -24,13 +24,6 @@ include $(DEPTH)/config/autoconf.mk

 PROGRAM = identity

-# Hardcoding dlopen()'s?  This needs to get fixed.
-#
-TOOLKIT_CFLAGS := \
-	-DWIDGET_DLL=\"libwidget$(MOZ_WIDGET_TOOLKIT).$(DLL_SUFFIX)\" \
-	-DGFXWIN_DLL=\"libgfx$(MOZ_GFX_TOOLKIT).$(DLL_SUFFIX)\" \
-	$(TK_CFLAGS)
-
 CPPSRCS = \
 		identity.cpp \
 		$(NULL)
@ -45,10 +38,9 @@ LIBS =	\
 		$(NSPR_LIBS)			\
 		$(NULL)

-
 include $(topsrcdir)/config/config.mk

-CXXFLAGS+=	$(TOOLKIT_CFLAGS)
+CXXFLAGS+=	$(MOZ_TOOLKIT_REGISTRY_CFLAGS)

 include $(topsrcdir)/config/rules.mk

--- a/mailnews/compose/tests/compose/Makefile.in
+++ b/mailnews/compose/tests/compose/Makefile.in
@ -58,8 +58,8 @@ LIBS = \
        -lsecfree \
        $(ZLIB_LIBS) \
        $(NSPR_LIBS) \
-        -lgfx$(MOZ_GFX_TOOLKIT)     \
-        -lraptorgfx     \
+		-lraptorgfx 	\
+		$(MOZ_GFX_TOOLKIT_LDFLAGS) \
        -limg           \
        -lmozutil       \
        $(TK_LIBS) \
--- a/mailnews/compose/tests/geturl/Makefile.in
+++ b/mailnews/compose/tests/geturl/Makefile.in
@ -30,9 +30,6 @@ LOCAL_INCLUDES  =

 REQUIRES	= 

-TOOLKIT_GFX_LIB		:= -lgfx$(MOZ_GFX_TOOLKIT)
-TOOLKIT_WIDGET_LIB	:= -lwidget$(MOZ_WIDGET_TOOLKIT)
-
 BASE_LIBS =	     \
 	-lpref	     \
 	$(ZLIB_LIBS) \
@ -45,9 +42,8 @@ BASE_LIBS =	     \

 GECKO_LIBS =		      \
 	-lraptorwebwidget     \
-	$(TOOLKIT_WIDGET_LIB) \
-	-lraptorgfx	      \
-	$(TOOLKIT_GFX_LIB)    \
+	-lraptorgfx 	\
+	$(MOZ_GFX_TOOLKIT_LDFLAGS) \
 	-lraptorhtmlpars      \
 	-lexpat \
 	-lxmltok \
--- a/mailnews/compose/tests/smtp/Makefile.in
+++ b/mailnews/compose/tests/smtp/Makefile.in
@ -61,8 +61,8 @@ LIBS = \
 	$(PNG_LIBS)     \
 	$(JPEG_LIBS)    \
 	-lxp	\
-	-lgfx$(MOZ_GFX_TOOLKIT)    \
-	-lraptorgfx \
+	-lraptorgfx 	\
+	$(MOZ_GFX_TOOLKIT_LDFLAGS) \
 	-lmozutil \
 	-lsecfree \
 	$(ZLIB_LIBS) \
--- a/mailnews/imap/tests/harness/Makefile.in
+++ b/mailnews/imap/tests/harness/Makefile.in
@ -58,8 +58,8 @@ LIBS =	\
 		-lexpat \
 		-lxmltok \
 		-limg \
-		-lgfx$(MOZ_GFX_TOOLKIT)        \
-		-lraptorgfx     \
+		-lraptorgfx 	\
+		$(MOZ_GFX_TOOLKIT_LDFLAGS) \
 		-lmozutil \
 		-lmsgbaseutil \
 		$(JPEG_LIBS) \
--- a/mailnews/local/tests/pop3/Makefile.in
+++ b/mailnews/local/tests/pop3/Makefile.in
@ -58,8 +58,8 @@ LIBS = \
 	-lsecfree \
 	$(ZLIB_LIBS) \
 	$(NSPR_LIBS) \
-	-lgfx$(MOZ_GFX_TOOLKIT)	\
-	-lraptorgfx	\
+	-lraptorgfx 	\
+	$(MOZ_GFX_TOOLKIT_LDFLAGS) \
 	-limg		\
 	-lmozutil	\
 	$(TK_LIBS) \
--- a/mailnews/mime/tests/mimetest/Makefile.in
+++ b/mailnews/mime/tests/mimetest/Makefile.in
@ -28,9 +28,6 @@ LOCAL_INCLUDES  =

 REQUIRES	= 

-TOOLKIT_GFX_LIB		:= -lgfx$(MOZ_GFX_TOOLKIT)
-TOOLKIT_WIDGET_LIB	:= -lwidget$(MOZ_WIDGET_TOOLKIT)
-
 BASE_LIBS =	     \
 	-lpref	     \
 	$(ZLIB_LIBS) \
@ -43,9 +40,9 @@ BASE_LIBS =	     \

 GECKO_LIBS =		      \
 	-lraptorwebwidget     \
-	$(TOOLKIT_WIDGET_LIB) \
-	-lraptorgfx	      \
-	$(TOOLKIT_GFX_LIB)    \
+	$(MOZ_WIDGET_TOOLKIT_LDFLAGS) \
+	-lraptorgfx 	\
+	$(MOZ_GFX_TOOLKIT_LDFLAGS) \
 	-lraptorhtmlpars      \
 	-lexpat \
 	-lxmltok \
--- a/mailnews/news/tests/nntp/Makefile.in
+++ b/mailnews/news/tests/nntp/Makefile.in
@ -61,8 +61,9 @@ LIBS = \
 	-limg	\
 	$(PNG_LIBS)     \
 	$(JPEG_LIBS)    \
-	-lgfx$(MOZ_GFX_TOOLKIT) 	\
+	$(MOZ_WIDGET_TOOLKIT_LDFLAGS) \
 	-lraptorgfx 	\
+	$(MOZ_GFX_TOOLKIT_LDFLAGS) \
 	-lmozutil	\
 	-lmsgbaseutil \
 	$(ZLIB_LIBS) \
--- a/network/module/tests/Makefile.in
+++ b/network/module/tests/Makefile.in
@ -33,8 +33,8 @@ LOCAL_INCLUDES := -I$(srcdir)/../src
 REQUIRES = raptor netlib xpcom reg pref

 LIBS = \
-	-lraptorgfx	\
-	-lgfx$(MOZ_GFX_TOOLKIT) \
+	-lraptorgfx 	\
+	$(MOZ_GFX_TOOLKIT_LDFLAGS) \
 	-lnetlib \
 	-labouturl \
 	-lfileurl \
--- a/parser/htmlparser/robot/Makefile.in
+++ b/parser/htmlparser/robot/Makefile.in
@ -54,8 +54,8 @@ LIBS		= \
 		-lhttpurl \
 		-lpwcac \
 		-l$(MOZ_LIB_JS_PREFIX)js \
-		-lgfx$(MOZ_GFX_TOOLKIT) \
-		-lraptorgfx \
+		-lraptorgfx 	\
+		$(MOZ_GFX_TOOLKIT_LDFLAGS) \
 		-limg	\
 		-lmozutil \
 		-lxpcom \
--- a/rdf/tests/rdfcat/Makefile.in
+++ b/rdf/tests/rdfcat/Makefile.in
@ -28,9 +28,6 @@ LOCAL_INCLUDES  =

 REQUIRES	= 

-TOOLKIT_GFX_LIB		:= -lgfx$(MOZ_GFX_TOOLKIT)
-TOOLKIT_WIDGET_LIB	:= -lwidget$(MOZ_WIDGET_TOOLKIT)
-
 BASE_LIBS =	     \
 	-lpref	     \
 	$(ZLIB_LIBS) \
@ -43,9 +40,8 @@ BASE_LIBS =	     \

 GECKO_LIBS =		      \
 	-lraptorwebwidget     \
-	$(TOOLKIT_WIDGET_LIB) \
-	-lraptorgfx	      \
-	$(TOOLKIT_GFX_LIB)    \
+	-lraptorgfx 	\
+	$(MOZ_GFX_TOOLKIT_LDFLAGS) \
 	-lraptorhtmlpars      \
 	-lexpat \
 	-lxmltok \
--- a/rdf/tests/rdfpoll/Makefile.in
+++ b/rdf/tests/rdfpoll/Makefile.in
@ -28,9 +28,6 @@ LOCAL_INCLUDES  =

 REQUIRES	= 

-TOOLKIT_GFX_LIB		:= -lgfx$(MOZ_GFX_TOOLKIT)
-TOOLKIT_WIDGET_LIB	:= -lwidget$(MOZ_WIDGET_TOOLKIT)
-
 BASE_LIBS =	     \
 	-lpref	     \
 	$(ZLIB_LIBS) \
@ -43,9 +40,8 @@ BASE_LIBS =	     \

 GECKO_LIBS =		      \
 	-lraptorwebwidget     \
-	$(TOOLKIT_WIDGET_LIB) \
-	-lraptorgfx	      \
-	$(TOOLKIT_GFX_LIB)    \
+	-lraptorgfx 	\
+	$(MOZ_GFX_TOOLKIT_LDFLAGS) \
 	-lraptorhtmlpars      \
 	-lexpat \
 	-lxmltok \
--- a/webshell/embed/gtk/lib/Makefile.am
+++ b/webshell/embed/gtk/lib/Makefile.am
@ -32,14 +32,11 @@ BASE_LIBS =          \
        -l$(MOZ_LIB_UTIL_PREFIX)util    \
        $(NULL)

-TOOLKIT_WIDGET_LIB = -lwidgetgtk
-TOOLKIT_GFX_LIB = -lgfxgtk
-
 GECKO_LIBS =                  \
        -lraptorwebwidget     \
-        $(TOOLKIT_WIDGET_LIB) \
-        -lraptorgfx           \
-        $(TOOLKIT_GFX_LIB)    \
+		$(MOZ_WIDGET_TOOLKIT_LDFLAGS) \
+		-lraptorgfx 	\
+		$(MOZ_GFX_TOOLKIT_LDFLAGS) \
        -lraptorhtmlpars      \
        -lexpat \
        -lxmltok \
--- a/webshell/tests/viewer/Makefile.in
+++ b/webshell/tests/viewer/Makefile.in
@ -55,21 +55,6 @@ EXPORT_RESOURCE_THROBBER := \
 	$(wildcard $(srcdir)/throbber/anim*.gif) \
 	$(NULL)

-TOOLKIT_GFX_LIB		:= -lgfx$(MOZ_GFX_TOOLKIT)
-TOOLKIT_WIDGET_LIB	:= -lwidget$(MOZ_WIDGET_TOOLKIT)
-
-ifeq ($(MOZ_GFX_TOOLKIT),xlib)
-TOOLKIT_GFX_XLIBRGB_LIB := -lxlibrgb
-endif
-
-# Hardcoding dlopen()'s?  This needs to get fixed.
-#
-TOOLKIT_CFLAGS := \
-	-DWIDGET_DLL=\"libwidget$(MOZ_WIDGET_TOOLKIT).$(DLL_SUFFIX)\" \
-	-DGFXWIN_DLL=\"libgfx$(MOZ_GFX_TOOLKIT).$(DLL_SUFFIX)\" \
-	$(TK_CFLAGS)
-
-
 TOOLKIT_CPPSRCS_beos := \
 	nsBeOSMain.cpp

@ -127,10 +112,9 @@ BASE_LIBS =	     \

 GECKO_LIBS =			\
 	-lraptorwebwidget	\
-	$(TOOLKIT_WIDGET_LIB)	\
+	$(MOZ_WIDGET_TOOLKIT_LDFLAGS) \
 	-lraptorgfx		\
-	$(TOOLKIT_GFX_LIB)	\
-	$(TOOLKIT_GFX_XLIBRGB_LIB) \
+	$(MOZ_GFX_TOOLKIT_LDFLAGS) \
 	-lraptorhtmlpars	\
 	-lexpat			\
 	-lxmltok		\
@ -181,7 +165,7 @@ LIBS =		       \

 include $(topsrcdir)/config/config.mk

-CXXFLAGS += $(TOOLKIT_CFLAGS)
+CXXFLAGS += $(MOZ_TOOLKIT_REGISTRY_CFLAGS)

 include $(topsrcdir)/config/rules.mk

@ -192,4 +176,3 @@ install:: $(PROGRAM) $(RUN_VIEWER_SCRIPT)
 	$(INSTALL) $(EXPORT_RESOURCE_THROBBER) $(DIST)/bin/res/throbber
 	$(INSTALL) $(srcdir)/resources/viewer.properties $(DIST)/bin/res
 	$(INSTALL) $(RUN_VIEWER_SCRIPT) $(DIST)/bin
-
--- a/widget/tests/scribble/Makefile.in
+++ b/widget/tests/scribble/Makefile.in
@ -25,16 +25,6 @@ include $(topsrcdir)/config/config.mk

 PROGRAM	= scribble

-TOOLKIT_GFX_LIB		:= -lgfx$(MOZ_GFX_TOOLKIT)
-TOOLKIT_WIDGET_LIB	:= -lwidget$(MOZ_WIDGET_TOOLKIT)
-
-# Hardcoding dlopen()'s?  This needs to get fixed.
-#
-TOOLKIT_CXXFLAGS := \
-	-DWIDGET_DLL=\"libwidget$(MOZ_WIDGET_TOOLKIT).$(DLL_SUFFIX)\" \
-	-DGFXWIN_DLL=\"libgfx$(MOZ_GFX_TOOLKIT).$(DLL_SUFFIX)\" \
-	$(TK_CFLAGS)
-
 CPPSRCS := \
 	Scribble.cpp    \
 	main.cpp	\
@ -51,6 +41,7 @@ LIBS := \
 	$(TOOLKIT_WIDGET_LIB) \
 	-lraptorgfx \
 	$(TOOLKIT_GFX_LIB) \
+	$(TOOLKIT_GFX_XLIBRGB_LIB) \
 	-lraptorhtmlpars \
 	-lraptorview \
 	-labouturl \
@ -81,7 +72,7 @@ LIBS := \
 	$(NULL)

 CFLAGS += $(TOOLKIT_CFLAGS)
-CXXFLAGS += $(TOOLKIT_CXXFLAGS) 
+CXXFLAGS += $(MOZ_TOOLKIT_REGISTRY_CFLAGS)

 include $(topsrcdir)/config/rules.mk

--- a/widget/tests/widget/Makefile.in
+++ b/widget/tests/widget/Makefile.in
@ -25,13 +25,6 @@ include $(topsrcdir)/config/config.mk

 PROGRAM = widget

-# Hardcoding dlopen()'s?  This needs to get fixed.
-#
-TOOLKIT_CXXFLAGS := \
-	-DWIDGET_DLL=\"libwidget$(MOZ_WIDGET_TOOLKIT).$(DLL_SUFFIX)\" \
-	-DGFX_DLL=\"libgfx$(MOZ_GFX_TOOLKIT).$(DLL_SUFFIX)\" \
-	$(TK_CFLAGS)
-
 CPPSRCS = \
 	main.cpp	 \
 	nsWidgetTest.cpp \
@ -61,7 +54,6 @@ NET_LIBS = 	\
 endif

 LIBS = \
-	-lraptorgfx \
 	-lpref \
 	-lsecfree \
 	-l$(MOZ_LIB_UTIL_PREFIX)util \
@ -71,24 +63,22 @@ LIBS = \
 	-lxpcom \
 	-lreg \
 	-l$(MOZ_LIB_JS_PREFIX)js \
-	-lwidget$(MOZ_WIDGET_TOOLKIT) \
-	-lgfx$(MOZ_GFX_TOOLKIT)    \
-	$(TK_LIBS) \
+	$(MOZ_WIDGET_TOOLKIT_LDFLAGS) \
 	-lraptorgfx \
+	$(MOZ_GFX_TOOLKIT_LDFLAGS) \
 	-lxp \
 	-lraptorhtmlpars \
 	-lexpat \
 	-lxmltok \
 	-ljsurl \
 	-ljsdom \
-	-lraptorgfx \
 	$(NET_LIBS) \
 	$(ZLIB_LIBS) \
 	$(NSPR_LIBS) \
 	$(NULL)

 CFLAGS += $(TOOLKIT_CFLAGS)
-CXXFLAGS += $(TOOLKIT_CXXFLAGS)
+CXXFLAGS += $(MOZ_TOOLKIT_REGISTRY_CFLAGS)

 include $(topsrcdir)/config/rules.mk

--- a/xpcom/tests/Makefile.in
+++ b/xpcom/tests/Makefile.in
@ -85,8 +85,8 @@ NETLIB_LIBS = 	\
 endif

 LIBS += \
-	-lraptorgfx	\
-	-lgfx$(MOZ_GFX_TOOLKIT) \
+	-lraptorgfx 	\
+	$(MOZ_GFX_TOOLKIT_LDFLAGS) \
 	$(TK_LIBS) \
 	-lpref \
 	-lsecfree \
--- a/xpfe/bootstrap/Makefile.in
+++ b/xpfe/bootstrap/Makefile.in
@ -29,21 +29,6 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
 BEOS_PROGRAM_RESOURCE = apprunner-beos.rsrc
 endif

-
-TOOLKIT_GFX_LIB     = -lgfx$(MOZ_GFX_TOOLKIT)
-TOOLKIT_WIDGET_LIB  = -lwidget$(MOZ_WIDGET_TOOLKIT)
-
-ifeq ($(MOZ_GFX_TOOLKIT),xlib)
-TOOLKIT_GFX_XLIBRGB_LIB := -lxlibrgb
-endif
-
-# Hardcoding dlopen()'s?  This needs to get fixed.
-#
-TOOLKIT_CFLAGS := \
-       -DWIDGET_DLL=\"libwidget$(MOZ_WIDGET_TOOLKIT).$(DLL_SUFFIX)\" \
-       -DGFXWIN_DLL=\"libgfx$(MOZ_GFX_TOOLKIT).$(DLL_SUFFIX)\" \
-       $(TK_CFLAGS)
-
 ifndef NECKO
 LIBS = 		\
 	-labouturl	\
@ -71,10 +56,9 @@ LIBS += \
 	-L$(DIST)/bin	\
 	-lnsappshell	\
 	-lxpcom		\
-	$(TOOLKIT_WIDGET_LIB)\
+	$(MOZ_WIDGET_TOOLKIT_LDFLAGS) \
 	-lraptorgfx	\
-	$(TOOLKIT_GFX_LIB)\
-	$(TOOLKIT_GFX_XLIBRGB_LIB) \
+	$(MOZ_GFX_TOOLKIT_LDFLAGS) \
 	-lreg		\
 	-lraptorwebwidget	\
 	-lraptorhtmlpars	\
@ -96,7 +80,6 @@ LIBS += \
 	$(NULL)


-
 CPPSRCS = \
 	nsAppRunner.cpp 	\
 	nsSetupRegistry.cpp	\
@ -105,7 +88,7 @@ CPPSRCS = \

 include $(topsrcdir)/config/rules.mk

-CXXFLAGS	+= $(TOOLKIT_CFLAGS)
+CXXFLAGS	+= $(MOZ_TOOLKIT_REGISTRY_CFLAGS)

 install:: $(srcdir)/mozilla-apprunner.sh
 	$(INSTALL) $< $(DIST)/bin