From 146e13192714691075ca7178023aef60296cbd41 Mon Sep 17 00:00:00 2001 From: "ramiro%netscape.com" Date: Wed, 7 Jul 1999 04:38:18 +0000 Subject: [PATCH] Define the toolkit flags in one place an reuse that. Hopefully this will put an end to the cut-n-paste insanity. git-svn-id: svn://10.0.0.236/trunk@38598 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/gfx/tests/Makefile.in | 4 ++-- mozilla/htmlparser/robot/Makefile.in | 4 ++-- mozilla/layout/html/tests/Makefile.in | 4 ++-- .../mailnews/base/tests/identity/Makefile.in | 10 +------- .../compose/tests/compose/Makefile.in | 4 ++-- .../mailnews/compose/tests/geturl/Makefile.in | 8 ++----- .../mailnews/compose/tests/smtp/Makefile.in | 4 ++-- .../mailnews/imap/tests/harness/Makefile.in | 4 ++-- mozilla/mailnews/local/tests/pop3/Makefile.in | 4 ++-- .../mailnews/mime/tests/mimetest/Makefile.in | 9 +++----- mozilla/mailnews/news/tests/nntp/Makefile.in | 3 ++- mozilla/network/module/tests/Makefile.in | 4 ++-- mozilla/parser/htmlparser/robot/Makefile.in | 4 ++-- mozilla/rdf/tests/rdfcat/Makefile.in | 8 ++----- mozilla/rdf/tests/rdfpoll/Makefile.in | 8 ++----- mozilla/webshell/embed/gtk/lib/Makefile.am | 9 +++----- mozilla/webshell/tests/viewer/Makefile.in | 23 +++---------------- mozilla/widget/tests/scribble/Makefile.in | 13 ++--------- mozilla/widget/tests/widget/Makefile.in | 16 +++---------- mozilla/xpcom/tests/Makefile.in | 4 ++-- mozilla/xpfe/bootstrap/Makefile.in | 23 +++---------------- 21 files changed, 46 insertions(+), 124 deletions(-) diff --git a/mozilla/gfx/tests/Makefile.in b/mozilla/gfx/tests/Makefile.in index cfe3a6af642..4b018024910 100644 --- a/mozilla/gfx/tests/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/htmlparser/robot/Makefile.in b/mozilla/htmlparser/robot/Makefile.in index ffff21c9547..4a799e9dde9 100644 --- a/mozilla/htmlparser/robot/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/layout/html/tests/Makefile.in b/mozilla/layout/html/tests/Makefile.in index 62390d525d7..22ab2cfc9e9 100644 --- a/mozilla/layout/html/tests/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/mailnews/base/tests/identity/Makefile.in b/mozilla/mailnews/base/tests/identity/Makefile.in index f7d4249003a..db4965ffef0 100644 --- a/mozilla/mailnews/base/tests/identity/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/mailnews/compose/tests/compose/Makefile.in b/mozilla/mailnews/compose/tests/compose/Makefile.in index 4449e28cb13..1c1824645c5 100644 --- a/mozilla/mailnews/compose/tests/compose/Makefile.in +++ b/mozilla/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) \ diff --git a/mozilla/mailnews/compose/tests/geturl/Makefile.in b/mozilla/mailnews/compose/tests/geturl/Makefile.in index 3d06c18fc7e..3f67401fca8 100644 --- a/mozilla/mailnews/compose/tests/geturl/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/mailnews/compose/tests/smtp/Makefile.in b/mozilla/mailnews/compose/tests/smtp/Makefile.in index 6fc7706a122..48bea074871 100644 --- a/mozilla/mailnews/compose/tests/smtp/Makefile.in +++ b/mozilla/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) \ diff --git a/mozilla/mailnews/imap/tests/harness/Makefile.in b/mozilla/mailnews/imap/tests/harness/Makefile.in index b476c36b9d6..b42696c6ee6 100644 --- a/mozilla/mailnews/imap/tests/harness/Makefile.in +++ b/mozilla/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) \ diff --git a/mozilla/mailnews/local/tests/pop3/Makefile.in b/mozilla/mailnews/local/tests/pop3/Makefile.in index 769f4f9a610..ffd0d5350a0 100644 --- a/mozilla/mailnews/local/tests/pop3/Makefile.in +++ b/mozilla/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) \ diff --git a/mozilla/mailnews/mime/tests/mimetest/Makefile.in b/mozilla/mailnews/mime/tests/mimetest/Makefile.in index 42cb29ecff0..55468026a2c 100644 --- a/mozilla/mailnews/mime/tests/mimetest/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/mailnews/news/tests/nntp/Makefile.in b/mozilla/mailnews/news/tests/nntp/Makefile.in index 23d043c89e6..5485aba3e50 100644 --- a/mozilla/mailnews/news/tests/nntp/Makefile.in +++ b/mozilla/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) \ diff --git a/mozilla/network/module/tests/Makefile.in b/mozilla/network/module/tests/Makefile.in index d84cd58ddbe..4c2fd1beab5 100644 --- a/mozilla/network/module/tests/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/parser/htmlparser/robot/Makefile.in b/mozilla/parser/htmlparser/robot/Makefile.in index ffff21c9547..4a799e9dde9 100644 --- a/mozilla/parser/htmlparser/robot/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/rdf/tests/rdfcat/Makefile.in b/mozilla/rdf/tests/rdfcat/Makefile.in index 49fb708a878..815d22c603b 100644 --- a/mozilla/rdf/tests/rdfcat/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/rdf/tests/rdfpoll/Makefile.in b/mozilla/rdf/tests/rdfpoll/Makefile.in index 14bd674da1c..be8fb89cb3c 100644 --- a/mozilla/rdf/tests/rdfpoll/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/webshell/embed/gtk/lib/Makefile.am b/mozilla/webshell/embed/gtk/lib/Makefile.am index 8459269c346..bbe46d594d8 100644 --- a/mozilla/webshell/embed/gtk/lib/Makefile.am +++ b/mozilla/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 \ diff --git a/mozilla/webshell/tests/viewer/Makefile.in b/mozilla/webshell/tests/viewer/Makefile.in index 6a6dbcd49a8..9f6cffa5ce0 100644 --- a/mozilla/webshell/tests/viewer/Makefile.in +++ b/mozilla/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 - diff --git a/mozilla/widget/tests/scribble/Makefile.in b/mozilla/widget/tests/scribble/Makefile.in index 2db849fb213..3dd85f95439 100644 --- a/mozilla/widget/tests/scribble/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/widget/tests/widget/Makefile.in b/mozilla/widget/tests/widget/Makefile.in index f23e9adbaac..fd65e4090c4 100644 --- a/mozilla/widget/tests/widget/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/xpcom/tests/Makefile.in b/mozilla/xpcom/tests/Makefile.in index 991d401659a..1b7458ace26 100644 --- a/mozilla/xpcom/tests/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/xpfe/bootstrap/Makefile.in b/mozilla/xpfe/bootstrap/Makefile.in index 5f1b45652fd..acbe1437e1d 100644 --- a/mozilla/xpfe/bootstrap/Makefile.in +++ b/mozilla/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