Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Separate the widget and gfx toolkits into two variables.

Browse Source 
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
This commit is contained in:
ramiro%netscape.com
1999-07-02 13:06:48 +00:00
parent 6619cf9d4a
commit 43391c2dca
38 changed files with 124 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mozilla/config/autoconf.mk.in
View File

@@ -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@

4
mozilla/config/mkdetect/Makefile.in
View File

@@ -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

74
mozilla/configure.in
View File

@@ -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)

2
mozilla/dom/src/build/Makefile.in
View File

@@ -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 \

2
mozilla/gfx/src/Makefile.in
View File

@@ -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

2
mozilla/gfx/tests/Makefile.in
View File

@@ -58,7 +58,7 @@ endif
LIBS = \
-lraptorgfx \
-lgfx$(MOZ_TOOLKIT) \
-lgfx$(MOZ_GFX_TOOLKIT) \
$(TK_LIBS) \
-lxpcom \
-lreg \

2
mozilla/htmlparser/robot/Makefile.in
View File

@@ -54,7 +54,7 @@ LIBS = \
-lhttpurl \
-lpwcac \
-l$(MOZ_LIB_JS_PREFIX)js \
-lgfx$(MOZ_TOOLKIT) \
-lgfx$(MOZ_GFX_TOOLKIT) \
-lraptorgfx \
-limg \
-lmozutil \

2
mozilla/layout/base/src/Makefile.in
View File

@@ -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 \

2
mozilla/layout/base/tests/Makefile.in
View File

@@ -50,7 +50,7 @@ LIBS = \
-lpref \
-lsecfree \
-lraptorgfx \
-lgfx$(MOZ_TOOLKIT) \
-lgfx$(MOZ_GFX_TOOLKIT) \
-limg \
-l$(MOZ_LIB_UTIL_PREFIX)util \
$(PNG_LIBS) \

2
mozilla/layout/html/tests/Makefile.in
View File

@@ -66,7 +66,7 @@ LIBS = \
-l$(MOZ_LIB_JS_PREFIX)js \
-ljsdom \
-lraptorgfx \
-lgfx$(MOZ_TOOLKIT) \
-lgfx$(MOZ_GFX_TOOLKIT) \
-lxpcom \
-lxp \
-lraptorhtmlpars \

4
mozilla/mailnews/base/tests/identity/Makefile.in
View File

@@ -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 = \

2
mozilla/mailnews/compose/tests/compose/Makefile.in
View File

@@ -58,7 +58,7 @@ LIBS = \
-lsecfree \
$(ZLIB_LIBS) \
$(NSPR_LIBS) \
-lgfx$(MOZ_TOOLKIT) \
-lgfx$(MOZ_GFX_TOOLKIT) \
-lraptorgfx \
-limg \
-lmozutil \

2
mozilla/mailnews/compose/tests/compose2/Makefile.in
View File

@@ -57,7 +57,7 @@ LIBS = \
-lsecfree \
$(ZLIB_LIBS) \
$(NSPR_LIBS) \
-lgfx$(MOZ_TOOLKIT) \
-lgfx$(MOZ_GFX_TOOLKIT) \
-lraptorgfx \
-limg \
-lmozutil \

4
mozilla/mailnews/compose/tests/geturl/Makefile.in
View File

@@ -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 \

2
mozilla/mailnews/compose/tests/sendlater/Makefile.in
View File

@@ -57,7 +57,7 @@ LIBS = \
-lsecfree \
$(ZLIB_LIBS) \
$(NSPR_LIBS) \
-lgfx$(MOZ_TOOLKIT) \
-lgfx$(MOZ_GFX_TOOLKIT) \
-lraptorgfx \
-limg \
-lmozutil \

2
mozilla/mailnews/compose/tests/sendpage/Makefile.in
View File

@@ -57,7 +57,7 @@ LIBS = \
-lsecfree \
$(ZLIB_LIBS) \
$(NSPR_LIBS) \
-lgfx$(MOZ_TOOLKIT) \
-lgfx$(MOZ_GFX_TOOLKIT) \
-lraptorgfx \
-limg \
-lmozutil \

2
mozilla/mailnews/compose/tests/smtp/Makefile.in
View File

@@ -61,7 +61,7 @@ LIBS = \
$(PNG_LIBS) \
$(JPEG_LIBS) \
-lxp \
-lgfx$(MOZ_TOOLKIT) \
-lgfx$(MOZ_GFX_TOOLKIT) \
-lraptorgfx \
-lmozutil \
-lsecfree \

2
mozilla/mailnews/imap/tests/harness/Makefile.in
View File

@@ -58,7 +58,7 @@ LIBS = \
-lexpat \
-lxmltok \
-limg \
-lgfx$(MOZ_TOOLKIT) \
-lgfx$(MOZ_GFX_TOOLKIT) \
-lraptorgfx \
-lmozutil \
-lmsgbaseutil \

2
mozilla/mailnews/local/tests/pop3/Makefile.in
View File

@@ -58,7 +58,7 @@ LIBS = \
-lsecfree \
$(ZLIB_LIBS) \
$(NSPR_LIBS) \
-lgfx$(MOZ_TOOLKIT) \
-lgfx$(MOZ_GFX_TOOLKIT) \
-lraptorgfx \
-limg \
-lmozutil \

4
mozilla/mailnews/mime/tests/mimetest/Makefile.in
View File

@@ -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 \

2
mozilla/mailnews/news/tests/newsParser/Makefile.in
View File

@@ -59,7 +59,7 @@ LIBS = \
-lxmltok \
-lraptorgfx \
-limg \
-lgfx$(MOZ_TOOLKIT) \
-lgfx$(MOZ_GFX_TOOLKIT) \
-lraptorgfx \
-lmozutil \
$(DIST)/lib/libmsgnews_s.a \

2
mozilla/mailnews/news/tests/nntp/Makefile.in
View File

@@ -61,7 +61,7 @@ LIBS = \
-limg \
$(PNG_LIBS) \
$(JPEG_LIBS) \
-lgfx$(MOZ_TOOLKIT) \
-lgfx$(MOZ_GFX_TOOLKIT) \
-lraptorgfx \
-lmozutil \
-lmsgbaseutil \

4
mozilla/modules/libpref/src/Makefile.in
View File

@@ -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

2
mozilla/network/module/tests/Makefile.in
View File

@@ -34,7 +34,7 @@ REQUIRES = raptor netlib xpcom reg pref
LIBS = \
-lraptorgfx \
-lgfx$(MOZ_TOOLKIT) \
-lgfx$(MOZ_GFX_TOOLKIT) \
-lnetlib \
-labouturl \
-lfileurl \

2
mozilla/parser/htmlparser/robot/Makefile.in
View File

@@ -54,7 +54,7 @@ LIBS = \
-lhttpurl \
-lpwcac \
-l$(MOZ_LIB_JS_PREFIX)js \
-lgfx$(MOZ_TOOLKIT) \
-lgfx$(MOZ_GFX_TOOLKIT) \
-lraptorgfx \
-limg \
-lmozutil \

4
mozilla/rdf/tests/rdfcat/Makefile.in
View File

@@ -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 \

4
mozilla/rdf/tests/rdfpoll/Makefile.in
View File

@@ -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 \

12
mozilla/webshell/tests/viewer/Makefile.in
View File

@@ -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 = \

1
mozilla/widget/public/nsIWidget.h
View File

@@ -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 \

2
mozilla/widget/src/Makefile.in
View File

@@ -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

8
mozilla/widget/src/build/Makefile.in
View File

@@ -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) \

2
mozilla/widget/src/xpwidgets/Makefile.in
View File

@@ -39,7 +39,7 @@ CPPSRCS= \
$(NULL)
LOCAL_INCLUDES := \
-I$(srcdir)/../$(MOZ_TOOLKIT) \
-I$(srcdir)/../$(MOZ_WIDGET_TOOLKIT) \
-I$(srcdir) \
$(NULL)

8
mozilla/widget/tests/scribble/Makefile.in
View File

@@ -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 := \

8
mozilla/widget/tests/widget/Makefile.in
View File

@@ -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 \

2
mozilla/xpcom/tests/Makefile.in
View File

@@ -86,7 +86,7 @@ endif
LIBS += \
-lraptorgfx \
-lgfx$(MOZ_TOOLKIT) \
-lgfx$(MOZ_GFX_TOOLKIT) \
$(TK_LIBS) \
-lpref \
-lsecfree \

17
mozilla/xpcom/threads/Makefile.in
View File

@@ -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

10
mozilla/xpfe/bootstrap/Makefile.in
View File

@@ -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

2
mozilla/xpfe/browser/resources/content/Makefile
View File

@@ -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