From 43391c2dcad07e6eb1e5f56cdf098d5b2f0cfdc6 Mon Sep 17 00:00:00 2001 From: "ramiro%netscape.com" Date: Fri, 2 Jul 1999 13:06:48 +0000 Subject: [PATCH] Separate the widget and gfx toolkits into two variables. Instead of MOZ_TOOLKIT, we now have MOZ_WIDGET_TOOLKIT and MOZ_GFX_TOOLKIT. There is also a new configure flag, --enable-gfx-toolkit which does what its name implies. The configure script should continue to work as before. git-svn-id: svn://10.0.0.236/trunk@38035 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/config/autoconf.mk.in | 3 +- mozilla/config/mkdetect/Makefile.in | 4 +- mozilla/configure.in | 74 ++++++++++++++++--- mozilla/dom/src/build/Makefile.in | 2 +- mozilla/gfx/src/Makefile.in | 2 +- mozilla/gfx/tests/Makefile.in | 2 +- mozilla/htmlparser/robot/Makefile.in | 2 +- mozilla/layout/base/src/Makefile.in | 2 +- mozilla/layout/base/tests/Makefile.in | 2 +- mozilla/layout/html/tests/Makefile.in | 2 +- .../mailnews/base/tests/identity/Makefile.in | 4 +- .../compose/tests/compose/Makefile.in | 2 +- .../compose/tests/compose2/Makefile.in | 2 +- .../mailnews/compose/tests/geturl/Makefile.in | 4 +- .../compose/tests/sendlater/Makefile.in | 2 +- .../compose/tests/sendpage/Makefile.in | 2 +- .../mailnews/compose/tests/smtp/Makefile.in | 2 +- .../mailnews/imap/tests/harness/Makefile.in | 2 +- mozilla/mailnews/local/tests/pop3/Makefile.in | 2 +- .../mailnews/mime/tests/mimetest/Makefile.in | 4 +- .../news/tests/newsParser/Makefile.in | 2 +- mozilla/mailnews/news/tests/nntp/Makefile.in | 2 +- mozilla/modules/libpref/src/Makefile.in | 4 +- mozilla/network/module/tests/Makefile.in | 2 +- mozilla/parser/htmlparser/robot/Makefile.in | 2 +- mozilla/rdf/tests/rdfcat/Makefile.in | 4 +- mozilla/rdf/tests/rdfpoll/Makefile.in | 4 +- mozilla/webshell/tests/viewer/Makefile.in | 12 +-- mozilla/widget/public/nsIWidget.h | 1 + mozilla/widget/src/Makefile.in | 2 +- mozilla/widget/src/build/Makefile.in | 8 +- mozilla/widget/src/xpwidgets/Makefile.in | 2 +- mozilla/widget/tests/scribble/Makefile.in | 8 +- mozilla/widget/tests/widget/Makefile.in | 8 +- mozilla/xpcom/tests/Makefile.in | 2 +- mozilla/xpcom/threads/Makefile.in | 17 ----- mozilla/xpfe/bootstrap/Makefile.in | 10 +-- .../xpfe/browser/resources/content/Makefile | 2 +- 38 files changed, 124 insertions(+), 89 deletions(-) diff --git a/mozilla/config/autoconf.mk.in b/mozilla/config/autoconf.mk.in index e06a4ab84ab..20d607a2a6a 100644 --- a/mozilla/config/autoconf.mk.in +++ b/mozilla/config/autoconf.mk.in @@ -24,7 +24,8 @@ MOZ_LIB_UTIL_PREFIX = moz MOZ_LIB_JS_PREFIX = moz MOZ_LIB_DBM_PREFIX = moz -MOZ_TOOLKIT = @MOZ_TOOLKIT@ +MOZ_GFX_TOOLKIT = @MOZ_GFX_TOOLKIT@ +MOZ_WIDGET_TOOLKIT = @MOZ_WIDGET_TOOLKIT@ MOZ_SECURITY = @MOZ_SECURITY@ MOZ_JAVA = @MOZ_JAVA@ MOZ_OJI = @MOZ_OJI@ diff --git a/mozilla/config/mkdetect/Makefile.in b/mozilla/config/mkdetect/Makefile.in index db58dcc619e..9d2b714ac35 100644 --- a/mozilla/config/mkdetect/Makefile.in +++ b/mozilla/config/mkdetect/Makefile.in @@ -40,7 +40,7 @@ DETECT_NAME = detect_$(DETECT_UNIQ_IDENT)_gen.mk DETECT_GLIBC = $(DETECT_DIR)/detect_glibc.sh -o $(DETECT_UNIQ_IDENT) \ -cc $(CC) -ifeq (motif, $(MOZ_TOOLKIT)) +ifeq (motif, $(MOZ_WIDGET_TOOLKIT)) # The motif detection script DETECT_MOTIF =\ $(DETECT_DIR)/detect_motif.sh -o $(DETECT_UNIQ_IDENT) \ @@ -155,7 +155,7 @@ endif ## Motif ## -ifeq ($(MOZ_TOOLKIT),motif) +ifeq ($(MOZ_WIDGET_TOOLKIT),motif) ## ## Set the motif include flags diff --git a/mozilla/configure.in b/mozilla/configure.in index 6c3b0627d26..1fd380d6b56 100644 --- a/mozilla/configure.in +++ b/mozilla/configure.in @@ -369,7 +369,7 @@ alpha*-*-linux*) *-nto*) if test "$no_x" = "yes"; then - MOZ_TOOLKIT='photon' + MOZ_WIDGET_TOOLKIT='photon' TK_LIBS='-lphoton -lphrender' AC_DEFINE(NO_X11) fi @@ -430,7 +430,7 @@ alpha*-*-osf*) *-qnx*) if test "$no_x" = "yes"; then - MOZ_TOOLKIT='photon' + MOZ_WIDGET_TOOLKIT='photon' TK_LIBS='-lphoton -lphrender' AC_DEFINE(NO_X11) fi @@ -548,6 +548,20 @@ LDFLAGS="$_SAVE_LDFLAGS" dnl Check for toolkit libs dnl ======================================================== useRhapsody=`echo $target_os | egrep "^Rhapsody"` + +dnl ======================================================== +dnl = +dnl = --enable-toolkit +dnl = +dnl = Select which toolkit to use for widgets. +dnl = +dnl = Choices are: +dnl = +dnl = gtk (default) +dnl = motif +dnl = xlib +dnl = +dnl ======================================================== AC_ARG_ENABLE(toolkit, [ --enable-toolkit=\$val Enable \$val fe (defaults to gtk)], [if test "$enableval" = "motif" \ @@ -556,17 +570,18 @@ AC_ARG_ENABLE(toolkit, -o "$useRhapsody" ; then dnl nglayout only supports building with one toolkit, dnl so ignore everything after the first comma (","). - MOZ_TOOLKIT=`echo "$enableval" | sed -e "s/,.*$//"` + MOZ_WIDGET_TOOLKIT=`echo "$enableval" | sed -e "s/,.*$//"` else AC_MSG_ERROR(Toolkit must be Xlib, GTK or Motif.) fi], [if test "$useRhapsody" ; then - MOZ_TOOLKIT="rhapsody" + MOZ_WIDGET_TOOLKIT="rhapsody" else - MOZ_TOOLKIT="gtk" + MOZ_WIDGET_TOOLKIT="gtk" fi]) -if echo ":$MOZ_TOOLKIT" | grep "motif" >/dev/null; then + +if echo ":$MOZ_WIDGET_TOOLKIT" | grep "motif" >/dev/null; then if test "$no_x" != "yes"; then if test "$x_includes"; then MOTIF_XINCS="-xif -I$x_includes" @@ -645,7 +660,7 @@ fi TK_CFLAGS="$MOTIF_INCLUDES" fi -if echo ":$MOZ_TOOLKIT" | grep "gtk" >/dev/null; then +if echo ":$MOZ_WIDGET_TOOLKIT" | grep "gtk" >/dev/null; then AM_PATH_GTK($GTK_VERSION,, AC_MSG_ERROR(Test for GTK failed.)) @@ -685,7 +700,7 @@ if echo ":$MOZ_TOOLKIT" | grep "gtk" >/dev/null; then fi # tk=xlib build. -if echo ":$MOZ_TOOLKIT" | grep "xlib" >/dev/null; then +if echo ":$MOZ_WIDGET_TOOLKIT" | grep "xlib" >/dev/null; then TK_CFLAGS='$(XCFLAGS)' TK_LIBS='$(XLDFLAGS) $(XLIBS)' fi @@ -694,9 +709,43 @@ fi # $no_x # BeOS toolkit setting if test "`echo $target_os | egrep "beos"`"; then - MOZ_TOOLKIT="beos" + MOZ_WIDGET_TOOLKIT="beos" fi + +dnl ======================================================== +dnl = +dnl = --enable-gfx-toolkit +dnl = +dnl = Select which toolkit to use for gfx (rendering) +dnl = +dnl = Choices are: +dnl = +dnl = gtk +dnl = motif +dnl = xlib +dnl = +dnl = Default is whatever MOZ_WIDGET_TOOLKIT is +dnl = +dnl = The only valid combinations are: +dnl = +dnl = widget gfx +dnl = ------ --- +dnl = gtk gtk +dnl = motif motif +dnl = xlib xlib +dnl = +dnl = motif xlib (broken) +dnl = gtk xlib (not tested yet) +dnl = +dnl ======================================================== +MOZ_GFX_TOOLKIT=$MOZ_WIDGET_TOOLKIT + +AC_ARG_ENABLE(gfx-toolkit, +[ --enable-gfx-toolkit=\$val Enable \$val fe (defaults to same as widget)], + [ MOZ_GFX_TOOLKIT=`echo "$enableval" | sed -e "s/,.*$//"` ], + []) + AC_SUBST(GTK_CONFIG) AC_SUBST(TK_CFLAGS) AC_SUBST(TK_LIBS) @@ -1594,12 +1643,12 @@ MOZ_ARG_ENABLE_BOOL(gtk-mozilla, MOZ_ENABLE_GTK_MOZILLA=1 MOZ_BUILD_ROOT=`pwd`) dnl Make sure GtkMozilla is only built if gtk is the mail toolkit -if test ! "$MOZ_TOOLKIT" = "gtk" -a "$MOZ_ENABLE_GTK_MOZILLA" +if test ! "$MOZ_WIDGET_TOOLKIT" = "gtk" -a "$MOZ_ENABLE_GTK_MOZILLA" then echo echo "*** You can only build GtkMozilla (A GTK+ widget to embed gecko)" echo "*** into any GTK+ app) if the main toolkit is \"gtk\"." - echo "*** You have currently chosen \"$MOZ_TOOLKIT\" as your main toolkit." + echo "*** You have currently chosen \"$MOZ_WIDGET_TOOLKIT\" as your main toolkit." echo "*** GtkMozilla will not be built." echo MOZ_ENABLE_GTK_MOZILLA= MOZ_BUILD_ROOT= @@ -1909,7 +1958,8 @@ AC_SUBST(AS) AC_SUBST(ASFLAGS) AC_SUBST(AS_DASH_C_FLAG) AC_SUBST(NS_USE_NATIVE) -AC_SUBST(MOZ_TOOLKIT) +AC_SUBST(MOZ_WIDGET_TOOLKIT) +AC_SUBST(MOZ_GFX_TOOLKIT) AC_SUBST(MOZ_UPDATE_XTERM) AC_SUBST(NECKO) AC_SUBST(MOZ_SECURITY) diff --git a/mozilla/dom/src/build/Makefile.in b/mozilla/dom/src/build/Makefile.in index 95d350a6e1f..3d623115040 100644 --- a/mozilla/dom/src/build/Makefile.in +++ b/mozilla/dom/src/build/Makefile.in @@ -41,7 +41,7 @@ CPPSRCS=nsDOMFactory.cpp \ INCLUDES += -I$(PUBLIC)/xpcom -I$(PUBLIC)/raptor \ -I$(PUBLIC)/dom -I$(PUBLIC)/js -I$(srcdir)/../base -I$(PUBLIC)/jsurl -GFX_DSO_FLAGS = $(addprefix -lgfx, $(MOZ_TOOLKIT)) +GFX_DSO_FLAGS = $(addprefix -lgfx, $(MOZ_GFX_TOOLKIT)) SHARED_LIBRARY_LIBS = \ $(DIST)/lib/libjsdombase_s.a \ diff --git a/mozilla/gfx/src/Makefile.in b/mozilla/gfx/src/Makefile.in index 2ffb512bce3..0477311e18b 100644 --- a/mozilla/gfx/src/Makefile.in +++ b/mozilla/gfx/src/Makefile.in @@ -24,7 +24,7 @@ include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/config.mk -DIRS = ps $(MOZ_TOOLKIT) +DIRS = ps $(MOZ_GFX_TOOLKIT) LIBRARY_NAME = raptorgfx diff --git a/mozilla/gfx/tests/Makefile.in b/mozilla/gfx/tests/Makefile.in index 4b685f66f11..cfe3a6af642 100644 --- a/mozilla/gfx/tests/Makefile.in +++ b/mozilla/gfx/tests/Makefile.in @@ -58,7 +58,7 @@ endif LIBS = \ -lraptorgfx \ - -lgfx$(MOZ_TOOLKIT) \ + -lgfx$(MOZ_GFX_TOOLKIT) \ $(TK_LIBS) \ -lxpcom \ -lreg \ diff --git a/mozilla/htmlparser/robot/Makefile.in b/mozilla/htmlparser/robot/Makefile.in index 135d54ca66d..ffff21c9547 100644 --- a/mozilla/htmlparser/robot/Makefile.in +++ b/mozilla/htmlparser/robot/Makefile.in @@ -54,7 +54,7 @@ LIBS = \ -lhttpurl \ -lpwcac \ -l$(MOZ_LIB_JS_PREFIX)js \ - -lgfx$(MOZ_TOOLKIT) \ + -lgfx$(MOZ_GFX_TOOLKIT) \ -lraptorgfx \ -limg \ -lmozutil \ diff --git a/mozilla/layout/base/src/Makefile.in b/mozilla/layout/base/src/Makefile.in index 82f70e412db..e9cc06a1ace 100644 --- a/mozilla/layout/base/src/Makefile.in +++ b/mozilla/layout/base/src/Makefile.in @@ -29,7 +29,7 @@ MODULE=layout # Alphabetical list of source files CPPSRCS = \ nsCaret.cpp \ - nsCaretProperties_$(MOZ_TOOLKIT).cpp \ + nsCaretProperties_$(MOZ_WIDGET_TOOLKIT).cpp \ nsCommentNode.cpp \ nsContentIterator.cpp \ nsContentList.cpp \ diff --git a/mozilla/layout/base/tests/Makefile.in b/mozilla/layout/base/tests/Makefile.in index 4340981db33..1e3bd2a78c5 100644 --- a/mozilla/layout/base/tests/Makefile.in +++ b/mozilla/layout/base/tests/Makefile.in @@ -50,7 +50,7 @@ LIBS = \ -lpref \ -lsecfree \ -lraptorgfx \ - -lgfx$(MOZ_TOOLKIT) \ + -lgfx$(MOZ_GFX_TOOLKIT) \ -limg \ -l$(MOZ_LIB_UTIL_PREFIX)util \ $(PNG_LIBS) \ diff --git a/mozilla/layout/html/tests/Makefile.in b/mozilla/layout/html/tests/Makefile.in index 36e10975307..62390d525d7 100644 --- a/mozilla/layout/html/tests/Makefile.in +++ b/mozilla/layout/html/tests/Makefile.in @@ -66,7 +66,7 @@ LIBS = \ -l$(MOZ_LIB_JS_PREFIX)js \ -ljsdom \ -lraptorgfx \ - -lgfx$(MOZ_TOOLKIT) \ + -lgfx$(MOZ_GFX_TOOLKIT) \ -lxpcom \ -lxp \ -lraptorhtmlpars \ diff --git a/mozilla/mailnews/base/tests/identity/Makefile.in b/mozilla/mailnews/base/tests/identity/Makefile.in index dca35d68935..f7d4249003a 100644 --- a/mozilla/mailnews/base/tests/identity/Makefile.in +++ b/mozilla/mailnews/base/tests/identity/Makefile.in @@ -27,8 +27,8 @@ PROGRAM = identity # Hardcoding dlopen()'s? This needs to get fixed. # TOOLKIT_CFLAGS := \ - -DWIDGET_DLL=\"libwidget$(MOZ_TOOLKIT).$(DLL_SUFFIX)\" \ - -DGFXWIN_DLL=\"libgfx$(MOZ_TOOLKIT).$(DLL_SUFFIX)\" \ + -DWIDGET_DLL=\"libwidget$(MOZ_WIDGET_TOOLKIT).$(DLL_SUFFIX)\" \ + -DGFXWIN_DLL=\"libgfx$(MOZ_GFX_TOOLKIT).$(DLL_SUFFIX)\" \ $(TK_CFLAGS) CPPSRCS = \ diff --git a/mozilla/mailnews/compose/tests/compose/Makefile.in b/mozilla/mailnews/compose/tests/compose/Makefile.in index 41e87f69e51..4449e28cb13 100644 --- a/mozilla/mailnews/compose/tests/compose/Makefile.in +++ b/mozilla/mailnews/compose/tests/compose/Makefile.in @@ -58,7 +58,7 @@ LIBS = \ -lsecfree \ $(ZLIB_LIBS) \ $(NSPR_LIBS) \ - -lgfx$(MOZ_TOOLKIT) \ + -lgfx$(MOZ_GFX_TOOLKIT) \ -lraptorgfx \ -limg \ -lmozutil \ diff --git a/mozilla/mailnews/compose/tests/compose2/Makefile.in b/mozilla/mailnews/compose/tests/compose2/Makefile.in index e9578d17b97..951695278c7 100644 --- a/mozilla/mailnews/compose/tests/compose2/Makefile.in +++ b/mozilla/mailnews/compose/tests/compose2/Makefile.in @@ -57,7 +57,7 @@ LIBS = \ -lsecfree \ $(ZLIB_LIBS) \ $(NSPR_LIBS) \ - -lgfx$(MOZ_TOOLKIT) \ + -lgfx$(MOZ_GFX_TOOLKIT) \ -lraptorgfx \ -limg \ -lmozutil \ diff --git a/mozilla/mailnews/compose/tests/geturl/Makefile.in b/mozilla/mailnews/compose/tests/geturl/Makefile.in index 98f80ea953c..3d06c18fc7e 100644 --- a/mozilla/mailnews/compose/tests/geturl/Makefile.in +++ b/mozilla/mailnews/compose/tests/geturl/Makefile.in @@ -30,8 +30,8 @@ LOCAL_INCLUDES = REQUIRES = -TOOLKIT_GFX_LIB := -lgfx$(MOZ_TOOLKIT) -TOOLKIT_WIDGET_LIB := -lwidget$(MOZ_TOOLKIT) +TOOLKIT_GFX_LIB := -lgfx$(MOZ_GFX_TOOLKIT) +TOOLKIT_WIDGET_LIB := -lwidget$(MOZ_WIDGET_TOOLKIT) BASE_LIBS = \ -lpref \ diff --git a/mozilla/mailnews/compose/tests/sendlater/Makefile.in b/mozilla/mailnews/compose/tests/sendlater/Makefile.in index 5439b0b7164..e230082a055 100644 --- a/mozilla/mailnews/compose/tests/sendlater/Makefile.in +++ b/mozilla/mailnews/compose/tests/sendlater/Makefile.in @@ -57,7 +57,7 @@ LIBS = \ -lsecfree \ $(ZLIB_LIBS) \ $(NSPR_LIBS) \ - -lgfx$(MOZ_TOOLKIT) \ + -lgfx$(MOZ_GFX_TOOLKIT) \ -lraptorgfx \ -limg \ -lmozutil \ diff --git a/mozilla/mailnews/compose/tests/sendpage/Makefile.in b/mozilla/mailnews/compose/tests/sendpage/Makefile.in index b0d22eee1b3..559771b0690 100644 --- a/mozilla/mailnews/compose/tests/sendpage/Makefile.in +++ b/mozilla/mailnews/compose/tests/sendpage/Makefile.in @@ -57,7 +57,7 @@ LIBS = \ -lsecfree \ $(ZLIB_LIBS) \ $(NSPR_LIBS) \ - -lgfx$(MOZ_TOOLKIT) \ + -lgfx$(MOZ_GFX_TOOLKIT) \ -lraptorgfx \ -limg \ -lmozutil \ diff --git a/mozilla/mailnews/compose/tests/smtp/Makefile.in b/mozilla/mailnews/compose/tests/smtp/Makefile.in index 7f59d12e02d..6fc7706a122 100644 --- a/mozilla/mailnews/compose/tests/smtp/Makefile.in +++ b/mozilla/mailnews/compose/tests/smtp/Makefile.in @@ -61,7 +61,7 @@ LIBS = \ $(PNG_LIBS) \ $(JPEG_LIBS) \ -lxp \ - -lgfx$(MOZ_TOOLKIT) \ + -lgfx$(MOZ_GFX_TOOLKIT) \ -lraptorgfx \ -lmozutil \ -lsecfree \ diff --git a/mozilla/mailnews/imap/tests/harness/Makefile.in b/mozilla/mailnews/imap/tests/harness/Makefile.in index 85bc1601f0b..b476c36b9d6 100644 --- a/mozilla/mailnews/imap/tests/harness/Makefile.in +++ b/mozilla/mailnews/imap/tests/harness/Makefile.in @@ -58,7 +58,7 @@ LIBS = \ -lexpat \ -lxmltok \ -limg \ - -lgfx$(MOZ_TOOLKIT) \ + -lgfx$(MOZ_GFX_TOOLKIT) \ -lraptorgfx \ -lmozutil \ -lmsgbaseutil \ diff --git a/mozilla/mailnews/local/tests/pop3/Makefile.in b/mozilla/mailnews/local/tests/pop3/Makefile.in index 9e4356eb728..769f4f9a610 100644 --- a/mozilla/mailnews/local/tests/pop3/Makefile.in +++ b/mozilla/mailnews/local/tests/pop3/Makefile.in @@ -58,7 +58,7 @@ LIBS = \ -lsecfree \ $(ZLIB_LIBS) \ $(NSPR_LIBS) \ - -lgfx$(MOZ_TOOLKIT) \ + -lgfx$(MOZ_GFX_TOOLKIT) \ -lraptorgfx \ -limg \ -lmozutil \ diff --git a/mozilla/mailnews/mime/tests/mimetest/Makefile.in b/mozilla/mailnews/mime/tests/mimetest/Makefile.in index 51d0b7f7b12..42cb29ecff0 100644 --- a/mozilla/mailnews/mime/tests/mimetest/Makefile.in +++ b/mozilla/mailnews/mime/tests/mimetest/Makefile.in @@ -28,8 +28,8 @@ LOCAL_INCLUDES = REQUIRES = -TOOLKIT_GFX_LIB := -lgfx$(MOZ_TOOLKIT) -TOOLKIT_WIDGET_LIB := -lwidget$(MOZ_TOOLKIT) +TOOLKIT_GFX_LIB := -lgfx$(MOZ_GFX_TOOLKIT) +TOOLKIT_WIDGET_LIB := -lwidget$(MOZ_WIDGET_TOOLKIT) BASE_LIBS = \ -lpref \ diff --git a/mozilla/mailnews/news/tests/newsParser/Makefile.in b/mozilla/mailnews/news/tests/newsParser/Makefile.in index 1fed132b1b0..0b70cf4926f 100644 --- a/mozilla/mailnews/news/tests/newsParser/Makefile.in +++ b/mozilla/mailnews/news/tests/newsParser/Makefile.in @@ -59,7 +59,7 @@ LIBS = \ -lxmltok \ -lraptorgfx \ -limg \ - -lgfx$(MOZ_TOOLKIT) \ + -lgfx$(MOZ_GFX_TOOLKIT) \ -lraptorgfx \ -lmozutil \ $(DIST)/lib/libmsgnews_s.a \ diff --git a/mozilla/mailnews/news/tests/nntp/Makefile.in b/mozilla/mailnews/news/tests/nntp/Makefile.in index 2540db1a79c..23d043c89e6 100644 --- a/mozilla/mailnews/news/tests/nntp/Makefile.in +++ b/mozilla/mailnews/news/tests/nntp/Makefile.in @@ -61,7 +61,7 @@ LIBS = \ -limg \ $(PNG_LIBS) \ $(JPEG_LIBS) \ - -lgfx$(MOZ_TOOLKIT) \ + -lgfx$(MOZ_GFX_TOOLKIT) \ -lraptorgfx \ -lmozutil \ -lmsgbaseutil \ diff --git a/mozilla/modules/libpref/src/Makefile.in b/mozilla/modules/libpref/src/Makefile.in index 848b3e3b206..b45a9234e79 100644 --- a/mozilla/modules/libpref/src/Makefile.in +++ b/mozilla/modules/libpref/src/Makefile.in @@ -37,7 +37,7 @@ PREF_JS_EXPORTS = $(srcdir)/initpref.js \ ifneq ($(subst /,_,$(shell uname -s)),OS2) -ifeq ($(MOZ_TOOLKIT),beos) +ifeq ($(MOZ_WIDGET_TOOLKIT),beos) PREF_JS_EXPORTS += $(srcdir)/beos/beos.js else PREF_JS_EXPORTS += $(srcdir)/unix/unix.js @@ -74,7 +74,7 @@ GARBAGE += $(DIST)/bin/components/initpref.js \ $(NULL) ifneq ($(subst /,_,$(shell uname -s)),OS2) -ifeq ($(MOZ_TOOLKIT),beos) +ifeq ($(MOZ_WIDGET_TOOLKIT),beos) GARBAGE += $(DIST)/bin/components/beos.js else GARBAGE += $(DIST)/bin/components/unix.js diff --git a/mozilla/network/module/tests/Makefile.in b/mozilla/network/module/tests/Makefile.in index 5bd7431a9cb..d84cd58ddbe 100644 --- a/mozilla/network/module/tests/Makefile.in +++ b/mozilla/network/module/tests/Makefile.in @@ -34,7 +34,7 @@ REQUIRES = raptor netlib xpcom reg pref LIBS = \ -lraptorgfx \ - -lgfx$(MOZ_TOOLKIT) \ + -lgfx$(MOZ_GFX_TOOLKIT) \ -lnetlib \ -labouturl \ -lfileurl \ diff --git a/mozilla/parser/htmlparser/robot/Makefile.in b/mozilla/parser/htmlparser/robot/Makefile.in index 135d54ca66d..ffff21c9547 100644 --- a/mozilla/parser/htmlparser/robot/Makefile.in +++ b/mozilla/parser/htmlparser/robot/Makefile.in @@ -54,7 +54,7 @@ LIBS = \ -lhttpurl \ -lpwcac \ -l$(MOZ_LIB_JS_PREFIX)js \ - -lgfx$(MOZ_TOOLKIT) \ + -lgfx$(MOZ_GFX_TOOLKIT) \ -lraptorgfx \ -limg \ -lmozutil \ diff --git a/mozilla/rdf/tests/rdfcat/Makefile.in b/mozilla/rdf/tests/rdfcat/Makefile.in index c45165e2561..49fb708a878 100644 --- a/mozilla/rdf/tests/rdfcat/Makefile.in +++ b/mozilla/rdf/tests/rdfcat/Makefile.in @@ -28,8 +28,8 @@ LOCAL_INCLUDES = REQUIRES = -TOOLKIT_GFX_LIB := -lgfx$(MOZ_TOOLKIT) -TOOLKIT_WIDGET_LIB := -lwidget$(MOZ_TOOLKIT) +TOOLKIT_GFX_LIB := -lgfx$(MOZ_GFX_TOOLKIT) +TOOLKIT_WIDGET_LIB := -lwidget$(MOZ_WIDGET_TOOLKIT) BASE_LIBS = \ -lpref \ diff --git a/mozilla/rdf/tests/rdfpoll/Makefile.in b/mozilla/rdf/tests/rdfpoll/Makefile.in index f6a014855cf..14bd674da1c 100644 --- a/mozilla/rdf/tests/rdfpoll/Makefile.in +++ b/mozilla/rdf/tests/rdfpoll/Makefile.in @@ -28,8 +28,8 @@ LOCAL_INCLUDES = REQUIRES = -TOOLKIT_GFX_LIB := -lgfx$(MOZ_TOOLKIT) -TOOLKIT_WIDGET_LIB := -lwidget$(MOZ_TOOLKIT) +TOOLKIT_GFX_LIB := -lgfx$(MOZ_GFX_TOOLKIT) +TOOLKIT_WIDGET_LIB := -lwidget$(MOZ_WIDGET_TOOLKIT) BASE_LIBS = \ -lpref \ diff --git a/mozilla/webshell/tests/viewer/Makefile.in b/mozilla/webshell/tests/viewer/Makefile.in index 2498ee4bb7b..609401ffdab 100644 --- a/mozilla/webshell/tests/viewer/Makefile.in +++ b/mozilla/webshell/tests/viewer/Makefile.in @@ -55,14 +55,14 @@ EXPORT_RESOURCE_THROBBER := \ $(wildcard $(srcdir)/throbber/anim*.gif) \ $(NULL) -TOOLKIT_GFX_LIB := -lgfx$(MOZ_TOOLKIT) -TOOLKIT_WIDGET_LIB := -lwidget$(MOZ_TOOLKIT) +TOOLKIT_GFX_LIB := -lgfx$(MOZ_GFX_TOOLKIT) +TOOLKIT_WIDGET_LIB := -lwidget$(MOZ_WIDGET_TOOLKIT) # Hardcoding dlopen()'s? This needs to get fixed. # TOOLKIT_CFLAGS := \ - -DWIDGET_DLL=\"libwidget$(MOZ_TOOLKIT).$(DLL_SUFFIX)\" \ - -DGFXWIN_DLL=\"libgfx$(MOZ_TOOLKIT).$(DLL_SUFFIX)\" \ + -DWIDGET_DLL=\"libwidget$(MOZ_WIDGET_TOOLKIT).$(DLL_SUFFIX)\" \ + -DGFXWIN_DLL=\"libgfx$(MOZ_GFX_TOOLKIT).$(DLL_SUFFIX)\" \ $(TK_CFLAGS) @@ -85,11 +85,11 @@ TOOLKIT_CPPSRCS_xlib := \ nsXlibMain.cpp -ifeq ($(MOZ_TOOLKIT),beos) +ifeq ($(MOZ_WIDGET_TOOLKIT),beos) BEOS_PROGRAM_RESOURCE = viewer-beos.rsrc endif -TOOLKIT_CPPSRCS := $(TOOLKIT_CPPSRCS_$(MOZ_TOOLKIT)) +TOOLKIT_CPPSRCS := $(TOOLKIT_CPPSRCS_$(MOZ_WIDGET_TOOLKIT)) CPPSRCS = \ diff --git a/mozilla/widget/public/nsIWidget.h b/mozilla/widget/public/nsIWidget.h index eaa511b144b..3513747eff3 100644 --- a/mozilla/widget/public/nsIWidget.h +++ b/mozilla/widget/public/nsIWidget.h @@ -63,6 +63,7 @@ typedef nsEventStatus (*PR_CALLBACK EVENT_CALLBACK)(nsGUIEvent *event); #define NS_NATIVE_OFFSETX 6 #define NS_NATIVE_OFFSETY 7 #define NS_NATIVE_PLUGIN_PORT 8 +#define NS_NATIVE_SCREEN 9 // {18032AD5-B265-11d1-AA2A-000000000000} #define NS_IWIDGET_IID \ diff --git a/mozilla/widget/src/Makefile.in b/mozilla/widget/src/Makefile.in index 43f6ecc9006..be09c7b7d63 100644 --- a/mozilla/widget/src/Makefile.in +++ b/mozilla/widget/src/Makefile.in @@ -22,7 +22,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = $(MOZ_TOOLKIT) xpwidgets build +DIRS = $(MOZ_WIDGET_TOOLKIT) xpwidgets build include $(topsrcdir)/config/config.mk diff --git a/mozilla/widget/src/build/Makefile.in b/mozilla/widget/src/build/Makefile.in index 25ae96a3099..3225b06c34d 100644 --- a/mozilla/widget/src/build/Makefile.in +++ b/mozilla/widget/src/build/Makefile.in @@ -22,9 +22,9 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME := widget$(MOZ_TOOLKIT) +LIBRARY_NAME := widget$(MOZ_WIDGET_TOOLKIT) -TOOLKIT_INCLUDES := -I$(srcdir)/../$(MOZ_TOOLKIT) +TOOLKIT_INCLUDES := -I$(srcdir)/../$(MOZ_WIDGET_TOOLKIT) LOCAL_INCLUDES := \ -I$(srcdir)/../xpwidgets \ @@ -55,7 +55,7 @@ CPPSRCS_beos := \ nsBeOSWidgetFactory.cpp CPPSRCS := \ - $(CPPSRCS_$(MOZ_TOOLKIT)) \ + $(CPPSRCS_$(MOZ_WIDGET_TOOLKIT)) \ nsWidgetSupport.cpp \ $(NULL) @@ -64,7 +64,7 @@ include $(topsrcdir)/config/config.mk CXXFLAGS += $(TK_CFLAGS) TOOLKIT_DSO_LDOPTS = $(addprefix $(DIST)/lib/libraptorwidget, \ - $(addsuffix _s.a, $(MOZ_TOOLKIT))) + $(addsuffix _s.a, $(MOZ_WIDGET_TOOLKIT))) SHARED_LIBRARY_LIBS = \ $(TOOLKIT_DSO_LDOPTS) \ diff --git a/mozilla/widget/src/xpwidgets/Makefile.in b/mozilla/widget/src/xpwidgets/Makefile.in index 58efa263b30..88fa73fe311 100644 --- a/mozilla/widget/src/xpwidgets/Makefile.in +++ b/mozilla/widget/src/xpwidgets/Makefile.in @@ -39,7 +39,7 @@ CPPSRCS= \ $(NULL) LOCAL_INCLUDES := \ - -I$(srcdir)/../$(MOZ_TOOLKIT) \ + -I$(srcdir)/../$(MOZ_WIDGET_TOOLKIT) \ -I$(srcdir) \ $(NULL) diff --git a/mozilla/widget/tests/scribble/Makefile.in b/mozilla/widget/tests/scribble/Makefile.in index 80a02c4d3f7..2db849fb213 100644 --- a/mozilla/widget/tests/scribble/Makefile.in +++ b/mozilla/widget/tests/scribble/Makefile.in @@ -25,14 +25,14 @@ include $(topsrcdir)/config/config.mk PROGRAM = scribble -TOOLKIT_GFX_LIB := -lgfx$(MOZ_TOOLKIT) -TOOLKIT_WIDGET_LIB := -lwidget$(MOZ_TOOLKIT) +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_TOOLKIT).$(DLL_SUFFIX)\" \ - -DGFXWIN_DLL=\"libgfx$(MOZ_TOOLKIT).$(DLL_SUFFIX)\" \ + -DWIDGET_DLL=\"libwidget$(MOZ_WIDGET_TOOLKIT).$(DLL_SUFFIX)\" \ + -DGFXWIN_DLL=\"libgfx$(MOZ_GFX_TOOLKIT).$(DLL_SUFFIX)\" \ $(TK_CFLAGS) CPPSRCS := \ diff --git a/mozilla/widget/tests/widget/Makefile.in b/mozilla/widget/tests/widget/Makefile.in index 1d974781c9f..f23e9adbaac 100644 --- a/mozilla/widget/tests/widget/Makefile.in +++ b/mozilla/widget/tests/widget/Makefile.in @@ -28,8 +28,8 @@ PROGRAM = widget # Hardcoding dlopen()'s? This needs to get fixed. # TOOLKIT_CXXFLAGS := \ - -DWIDGET_DLL=\"libwidget$(MOZ_TOOLKIT).$(DLL_SUFFIX)\" \ - -DGFX_DLL=\"libgfx$(MOZ_TOOLKIT).$(DLL_SUFFIX)\" \ + -DWIDGET_DLL=\"libwidget$(MOZ_WIDGET_TOOLKIT).$(DLL_SUFFIX)\" \ + -DGFX_DLL=\"libgfx$(MOZ_GFX_TOOLKIT).$(DLL_SUFFIX)\" \ $(TK_CFLAGS) CPPSRCS = \ @@ -71,8 +71,8 @@ LIBS = \ -lxpcom \ -lreg \ -l$(MOZ_LIB_JS_PREFIX)js \ - -lwidget$(MOZ_TOOLKIT) \ - -lgfx$(MOZ_TOOLKIT) \ + -lwidget$(MOZ_WIDGET_TOOLKIT) \ + -lgfx$(MOZ_GFX_TOOLKIT) \ $(TK_LIBS) \ -lraptorgfx \ -lxp \ diff --git a/mozilla/xpcom/tests/Makefile.in b/mozilla/xpcom/tests/Makefile.in index d2e046b198a..991d401659a 100644 --- a/mozilla/xpcom/tests/Makefile.in +++ b/mozilla/xpcom/tests/Makefile.in @@ -86,7 +86,7 @@ endif LIBS += \ -lraptorgfx \ - -lgfx$(MOZ_TOOLKIT) \ + -lgfx$(MOZ_GFX_TOOLKIT) \ $(TK_LIBS) \ -lpref \ -lsecfree \ diff --git a/mozilla/xpcom/threads/Makefile.in b/mozilla/xpcom/threads/Makefile.in index d874da2d825..0997822bbe4 100644 --- a/mozilla/xpcom/threads/Makefile.in +++ b/mozilla/xpcom/threads/Makefile.in @@ -44,16 +44,6 @@ EXPORTS = \ nsIThread.h \ $(NULL) -ifdef TIMER_IN_XPCOM -CPPSRCS += nsTimer_$(MOZ_TOOLKIT).cpp - -EXPORTS += \ - nsITimer.h \ - nsITimerCallback.h \ - $(NULL) -endif - - EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) LOCAL_INCLUDES = -I$(srcdir)/../components @@ -68,12 +58,5 @@ MKSHLIB := override NO_SHARED_LIB=1 override NO_STATIC_LIB= -ifdef TIMER_IN_XPCOM -# For nsTimer_$(MOZ_TOOLKIT).cpp -# The following is required by gtk, xlib, photon -# motif and rhapsody didn't need it -CXXFLAGS += $(TK_CFLAGS) -endif - include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpfe/bootstrap/Makefile.in b/mozilla/xpfe/bootstrap/Makefile.in index 51861c69f21..531b6a777bf 100644 --- a/mozilla/xpfe/bootstrap/Makefile.in +++ b/mozilla/xpfe/bootstrap/Makefile.in @@ -25,19 +25,19 @@ MODULE = apprunner include $(DEPTH)/config/autoconf.mk -ifeq ($(MOZ_TOOLKIT),beos) +ifeq ($(MOZ_WIDGET_TOOLKIT),beos) BEOS_PROGRAM_RESOURCE = apprunner-beos.rsrc endif -TOOLKIT_GFX_LIB = -lgfx$(MOZ_TOOLKIT) -TOOLKIT_WIDGET_LIB = -lwidget$(MOZ_TOOLKIT) +TOOLKIT_GFX_LIB = -lgfx$(MOZ_GFX_TOOLKIT) +TOOLKIT_WIDGET_LIB = -lwidget$(MOZ_WIDGET_TOOLKIT) # Hardcoding dlopen()'s? This needs to get fixed. # TOOLKIT_CFLAGS := \ - -DWIDGET_DLL=\"libwidget$(MOZ_TOOLKIT).$(DLL_SUFFIX)\" \ - -DGFXWIN_DLL=\"libgfx$(MOZ_TOOLKIT).$(DLL_SUFFIX)\" \ + -DWIDGET_DLL=\"libwidget$(MOZ_WIDGET_TOOLKIT).$(DLL_SUFFIX)\" \ + -DGFXWIN_DLL=\"libgfx$(MOZ_GFX_TOOLKIT).$(DLL_SUFFIX)\" \ $(TK_CFLAGS) ifndef NECKO diff --git a/mozilla/xpfe/browser/resources/content/Makefile b/mozilla/xpfe/browser/resources/content/Makefile index 0026fd36d90..afff2dd22f7 100644 --- a/mozilla/xpfe/browser/resources/content/Makefile +++ b/mozilla/xpfe/browser/resources/content/Makefile @@ -1,4 +1,3 @@ -# Generated automatically from Makefile.in by configure. #!gmake # # The contents of this file are subject to the Netscape Public License @@ -18,6 +17,7 @@ DEPTH = ../../../.. topsrcdir = ../../../.. +VPATH = . srcdir = . include $(DEPTH)/config/autoconf.mk