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

Remove Motif port from build. Pull using MOTIF_LAST_RITES tag to resurrect (but why would you want to do a silly thing like that?)

Browse Source 
Bug #89330 r=bryner sr=pavlov


git-svn-id: svn://10.0.0.236/trunk@105276 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cls%seawood.org 2001-10-12 20:21:31 +00:00
parent 830bd80be0
commit e11146551f
10 changed files with 5 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mozilla/allmakefiles.sh
View File

@ -132,7 +132,6 @@ gfx/src/Makefile
gfx/src/beos/Makefile
gfx/src/gtk/Makefile
gfx/src/ps/Makefile
gfx/src/motif/Makefile
gfx/src/photon/Makefile
gfx/src/rhapsody/Makefile
gfx/src/mac/Makefile
@ -506,7 +505,6 @@ webshell/tests/viewer/Makefile
webshell/tests/viewer/public/Makefile
webshell/tests/viewer/unix/Makefile
webshell/tests/viewer/unix/gtk/Makefile
webshell/tests/viewer/unix/motif/Makefile
webshell/tests/viewer/unix/qt/Makefile
webshell/tests/viewer/unix/xlib/Makefile
webshell/embed/Makefile
@ -521,8 +519,6 @@ widget/src/build/Makefile
widget/src/gtk/Makefile
widget/src/gtksuperwin/Makefile
widget/src/gtkxtbin/Makefile
widget/src/motif/Makefile
widget/src/motif/app_context/Makefile
widget/src/photon/Makefile
widget/src/rhapsody/Makefile
widget/src/mac/Makefile
@ -541,7 +537,6 @@ widget/timer/src/beos/Makefile
widget/timer/src/rhapsody/Makefile
widget/timer/src/unix/Makefile
widget/timer/src/unix/gtk/Makefile
widget/timer/src/unix/motif/Makefile
widget/timer/src/unix/photon/Makefile
widget/timer/src/unix/xlib/Makefile
widget/timer/src/unix/qt/Makefile

4
mozilla/config/Makefile.in
View File

@ -112,8 +112,4 @@ clean clobber realclean clobber_all::
cd $(MKDEPEND_DIR); $(MAKE) $@
endif
ifdef MOZILLA_DETECT
clean clobber realclean clobber_all::
cd $(MOZILLA_DETECT_DIR); $(MAKE) $@
endif

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

@ -276,7 +276,6 @@ MOZ_TOOLKIT_REGISTRY_CFLAGS = \
MOZ_ENABLE_GTK = @MOZ_ENABLE_GTK@
MOZ_ENABLE_GTK2 = @MOZ_ENABLE_GTK2@
MOZ_ENABLE_MOTIF = @MOZ_ENABLE_MOTIF@
MOZ_ENABLE_XLIB = @MOZ_ENABLE_XLIB@
MOZ_ENABLE_QT = @MOZ_ENABLE_QT@
MOZ_ENABLE_PHOTON = @MOZ_ENABLE_PHOTON@
@ -288,9 +287,6 @@ MOZ_GTK_LDFLAGS = @MOZ_GTK_LDFLAGS@
MOZ_GTK2_CFLAGS = @MOZ_GTK2_CFLAGS@
MOZ_GTK2_LDFLAGS = @MOZ_GTK2_LDFLAGS@
MOZ_MOTIF_CFLAGS = @MOZ_MOTIF_CFLAGS@
MOZ_MOTIF_LDFLAGS = @MOZ_MOTIF_LDFLAGS@
MOZ_XLIB_CFLAGS = @MOZ_XLIB_CFLAGS@
MOZ_XLIB_LDFLAGS = @MOZ_XLIB_LDFLAGS@

153
mozilla/configure.in
View File

@ -91,7 +91,6 @@ GTK2_VERSION=1.3.7
dnl Set various checks
dnl ========================================================
MISSING_MOTIF=
MISSING_NSPR=
MISSING_X=
@ -1153,8 +1152,7 @@ then
dnl ========================================================
AC_ARG_ENABLE(toolkit,
[ --enable-toolkit=\$val Enable \$val fe (defaults to gtk)],
[ if test "$enableval" = "motif" \
-o "$enableval" = "gtk" \
[ if test "$enableval" = "gtk" \
-o "$enableval" = "qt" \
-o "$enableval" = "gtk2" \
-o "$enableval" = "xlib"
@ -1163,7 +1161,7 @@ then
dnl so ignore everything after the first comma (",").
MOZ_WIDGET_TOOLKIT=`echo "$enableval" | sed -e "s/,.*$//"`
else
AC_MSG_ERROR(Toolkit must be xlib, gtk, gtk2, qt, or motif.)
AC_MSG_ERROR(Toolkit must be xlib, gtk, gtk2 or qt.)
fi],
[ MOZ_WIDGET_TOOLKIT="gtk" ])
@ -1258,7 +1256,6 @@ dnl XXX BROKEN dnl =
dnl XXX BROKEN dnl = Choices are:
dnl XXX BROKEN dnl =
dnl XXX BROKEN dnl = gtk
dnl XXX BROKEN dnl = motif
dnl XXX BROKEN dnl = xlib
dnl XXX BROKEN dnl =
dnl XXX BROKEN dnl = Default is whatever MOZ_WIDGET_TOOLKIT is
@ -1268,10 +1265,8 @@ dnl XXX BROKEN dnl =
dnl XXX BROKEN dnl = widget gfx
dnl XXX BROKEN dnl = ------ ---
dnl XXX BROKEN dnl = gtk gtk
dnl XXX BROKEN dnl = motif motif
dnl XXX BROKEN dnl = xlib xlib
dnl XXX BROKEN dnl =
dnl XXX BROKEN dnl = motif xlib (broken)
dnl XXX BROKEN dnl = gtk xlib (not tested yet)
dnl XXX BROKEN dnl =
dnl XXX BROKEN dnl ========================================================
@ -1327,13 +1322,6 @@ then
AC_DEFINE(MOZ_WIDGET_QT)
fi
if test "$MOZ_WIDGET_TOOLKIT" = "motif"
then
MOZ_ENABLE_MOTIF=1
MOZ_ENABLE_XREMOTE=1
AC_DEFINE(MOZ_WIDGET_MOTIF)
fi
if test "$MOZ_WIDGET_TOOLKIT" = "photon"
then
MOZ_ENABLE_PHOTON=1
@ -1517,129 +1505,6 @@ dnl = End Xprint support hackery =
dnl = =
dnl ========================================================
dnl ========================================================
dnl = =
dnl = --with-motif =
dnl = =
dnl = Motif support hackery =
dnl = =
dnl ========================================================
if test "$no_x" != "yes"
then
AC_ARG_WITH(motif,
[ --with-motif Enable Motif support ],
[
if test "$withval" = "yes"
then
MOZ_ENABLE_MOTIF=1
else
MOZ_ENABLE_MOTIF=
fi
])
fi
if test "$MOZ_ENABLE_MOTIF"
then
AC_MSG_CHECKING(for motif insanity)
if test "$x_includes"
then
MOTIF_XINCS="-xif -I$x_includes"
fi
detect_motif="${srcdir}/config/mkdetect/detect_motif.sh -cc $CC $MOTIF_XINCS"
MOTIF_VERSION=`${detect_motif}`
MOTIF_INCLUDES=`${detect_motif} -if`
MOTIF_STATIC_FLAGS=`${detect_motif} -sf`
MOTIF_DYNAMIC_FLAGS=`${detect_motif} -df`
MOTIF_DYNAMIC_PATHS=`${detect_motif} -dp`
dnl MOTIF_REQUIRES_XPM=`${detect_motif} -xpm`
MOTIF_REQUIRES_XPM="False"
${srcdir}/config/mkdetect/detect_motif.sh --cleanup
if test "$MOTIF_REQUIRES_XPM" = "True" -o "$MOTIF_VERSION" = "2.1"
then
_SAVE_LDFLAGS="$LDFLAGS"
LDFLAGS="$XLDFLAGS $LDFLAGS"
fi
if test "$MOTIF_REQUIRES_XPM" = "True"
then
AC_CHECK_LIB(Xpm, XpmWriteFileFromImage,
XPM_LIBS="-lXpm",
[MISSING_MOTIF="$MISSING_MOTIF -lXpm"], $XLIBS)
fi
if test "$MOTIF_VERSION" = "2.1"
then
AC_CHECK_LIB(Xp, XpGetPrinterList,
MOTIF_XP_LIBS="-lXp",
[MISSING_MOTIF="$MISSING_MOTIF -lXp"], $XEXT_LIBS $XLIBS)
fi
LDFLAGS="$_SAVE_LDFLAGS"
MOZ_MOTIF_LDFLAGS="$XLDFLAGS $MOZ_MOTIF_LDFLAGS"
if test "$MOTIF_STATIC_LIB" = "unknown" -a "$MOTIF_DYNAMIC_LIB" = "unknown"
then
AC_MSG_RESULT(no)
else
AC_MSG_RESULT(yes)
fi
# Get rid of offending error values
if test "$MOTIF_DYNAMIC_PATHS" = "unknown"
then
MOTIF_DYNAMIC_PATHS=
fi
if test "$MOTIF_DYNAMIC_FLAGS" = "unknown"
then
MOTIF_DYNAMIC_FLAGS=
fi
if test "$MOTIF_STATIC_FLAGS" = "unknown"
then
MOTIF_STATIC_FLAGS=
fi
if test "$MOTIF_INCLUDE_DIR" = "unknown"
then
MOTIF_INCLUDE_DIR=
fi
MOZ_MOTIF_LDFLAGS="$MOTIF_XP_LIBS $MOZ_MOTIF_LDFLAGS $X_LIBS $XT_LIBS $XMU_LIBS $XPM_LIBS $XEXT_LIBS $X11_LIBS $XSM_LIBS $XICE_LIBS"
AC_ARG_WITH(static-motif,
[ --with-static-motif Link Motif statically if possible],
sysstaticmotif=$withval)
if test "$sysstaticmotif" != "yes"; then
_SAVE_LDFLAGS="$LDFLAGS"
LDFLAGS="$MOTIF_DYNAMIC_PATHS $XLDFLAGS $LDFLAGS"
AC_CHECK_LIB(Xm, XmStringCreate,
MOZ_MOTIF_LDFLAGS="$MOTIF_DYNAMIC_PATHS $MOTIF_DYNAMIC_FLAGS $MOZ_MOTIF_LDFLAGS",
[MISSING_MOTIF="$MISSING_MOTIF $MOTIF_DYNAMIC_FLAGS"],
$MOTIF_DYNAMIC_PATHS $MOZ_MOTIF_LDFLAGS $XLIBS)
LDFLAGS="$_SAVE_LDFLAGS"
else
AC_CHECK_LIB(Xm, XmStringCreate,
MOZ_MOTIF_LDFLAGS="$MOTIF_STATIC_FLAGS $MOZ_MOTIF_LDFLAGS",
[MISSING_MOTIF="$MISSING_MOTIF $MOTIF_STATIC_FLAGS"],
$MOZ_MOTIF_LDFLAGS $XLIBS)
fi
MOZ_MOTIF_CFLAGS="$MOTIF_INCLUDES"
fi
dnl ========================================================
dnl = =
dnl = End Motif support hackery =
dnl = =
dnl ========================================================
dnl ========================================================
dnl = =
dnl = --with-xlib =
@ -1812,12 +1677,6 @@ then
TK_LIBS="$MOZ_QT_LDFLAGS"
fi
if test "$MOZ_WIDGET_TOOLKIT" = "motif"
then
TK_CFLAGS="$MOZ_MOTIF_CFLAGS"
TK_LIBS="$MOZ_MOTIF_LDFLAGS"
fi
dnl ========================================================
dnl = =
dnl = Make sure a default toolkit is set =
@ -1830,7 +1689,6 @@ AC_SUBST(TK_CFLAGS)
AC_SUBST(TK_LIBS)
AC_SUBST(MOZ_ENABLE_GTK)
AC_SUBST(MOZ_ENABLE_MOTIF)
AC_SUBST(MOZ_ENABLE_XLIB)
AC_SUBST(MOZ_ENABLE_GTK2)
AC_SUBST(MOZ_ENABLE_QT)
@ -1840,8 +1698,6 @@ AC_SUBST(MOZ_GTK_CFLAGS)
AC_SUBST(MOZ_GTK_LDFLAGS)
AC_SUBST(MOZ_GTK2_CFLAGS)
AC_SUBST(MOZ_GTK2_LDFLAGS)
AC_SUBST(MOZ_MOTIF_CFLAGS)
AC_SUBST(MOZ_MOTIF_LDFLAGS)
AC_SUBST(MOZ_XLIB_CFLAGS)
AC_SUBST(MOZ_XLIB_LDFLAGS)
AC_SUBST(MOZ_XPRINT_CFLAGS)
@ -1866,7 +1722,7 @@ AC_SUBST(XLIBS)
AC_SUBST(MOC)
if test "$MOZ_ENABLE_GTK" || test "$MOZ_ENABLE_QT" \
|| test "$MOZ_ENABLE_XLIB" || test "$MOZ_ENABLE_MOTIF" \
|| test "$MOZ_ENABLE_XLIB" \
|| test "$MOZ_ENABLE_GTK2"
then
AC_DEFINE(MOZ_X11)
@ -4436,9 +4292,6 @@ if test ! -z "$MISSING_X"; then
AC_MSG_ERROR([ Could not find the following X libraries: $MISSING_X ]);
fi
if test ! -z "$MISSING_MOTIF"; then
AC_MSG_ERROR([ Could not find the following Motif libraries: $MISSING_MOTIF ]);
fi
fi # $no_x
dnl Set various defines and substitutions

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

@ -48,7 +48,7 @@ DIRS = ps
endif
# Build xlibrgb only for X toolkits and/or Xprint
ifneq (,$(filter motif xlib,$(MOZ_WIDGET_TOOLKIT))$(MOZ_ENABLE_XLIB)$(MOZ_ENABLE_XPRINT))
ifneq (,$(filter xlib,$(MOZ_WIDGET_TOOLKIT))$(MOZ_ENABLE_XLIB)$(MOZ_ENABLE_XPRINT))
DIRS += xlibrgb
endif
@ -62,9 +62,6 @@ endif
ifdef MOZ_ENABLE_GTK2
DIRS += gtk2
endif
ifdef MOZ_ENABLE_MOTIF
DIRS += motif
endif
ifdef MOZ_ENABLE_QT
DIRS += qt
endif

4
mozilla/webshell/embed/xlib/Makefile.in
View File

@ -30,10 +30,6 @@ ifdef MOZ_ENABLE_GTK
DIRS += gtk
endif
ifdef MOZ_ENABLE_MOTIF
DIRS += motif xt
endif
ifdef MOZ_ENABLE_QT
DIRS += qt
endif

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

@ -135,7 +135,6 @@ LIBS = \
$(PROFILER_LIBS) \
$(NULL)
MOTIF_LIBS = -lviewer_motif_s $(XP_LIBS) $(MOZ_MOTIF_LDFLAGS)
QT_LIBS = -lviewer_qt_s $(XP_LIBS) $(MOZ_QT_LDFLAGS)
XLIB_LIBS = -lviewer_xlib_s $(XP_LIBS) $(MOZ_XLIB_LDFLAGS)
GTK_LIBS = -lviewer_gtk_s -lgtksuperwin $(XP_LIBS) $(MOZ_GTK_LDFLAGS)
@ -167,7 +166,7 @@ endif
CXXFLAGS += $(MOZ_TOOLKIT_REGISTRY_CFLAGS)
GARBAGE += $(PROGRAM)_gtk $(PROGRAM)_motif $(PROGRAM)_qt $(PROGRAM)_xlib
GARBAGE += $(PROGRAM)_gtk $(PROGRAM)_qt $(PROGRAM)_xlib
install:: $(PROGRAM) $(srcdir)/mozilla-viewer.sh
ifneq ($(MOZ_WIDGET_TOOLKIT),os2)
@ -177,9 +176,6 @@ endif
unix/gtk/libviewer_gtk_s.a:
@$(MAKE) -C $(@D) $(@F)
unix/motif/libviewer_motif_s.a:
@$(MAKE) -C $(@D) $(@F)
unix/qt/libviewer_qt_s.a:
@$(MAKE) -C $(@D) $(@F)
@ -191,10 +187,6 @@ $(PROGRAM)_gtk: $(PROGOBJS) $(EXTRA_DEPS) Makefile Makefile.in unix/gtk/libviewe
$(MOZ_POST_PROGRAM_COMMAND) $@
$(PROGRAM)_motif: $(PROGOBJS) $(EXTRA_DEPS) Makefile Makefile.in unix/motif/libviewer_motif_s.a
$(CCC) $(CXXFLAGS) -o $@ $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(MOTIF_LIBS) $(OS_LIBS) $(PROFILER_LIBS)
$(MOZ_POST_PROGRAM_COMMAND) $@
$(PROGRAM)_qt: $(PROGOBJS) $(EXTRA_DEPS) Makefile Makefile.in unix/qt/libviewer_qt_s.a
$(CCC) $(CXXFLAGS) -o $@ $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(QT_LIBS) $(OS_LIBS) $(PROFILER_LIBS)
$(MOZ_POST_PROGRAM_COMMAND) $@
@ -208,11 +200,6 @@ install:: $(PROGRAM)_gtk
$(INSTALL) -m 555 $< $(DIST)/bin
endif
ifdef MOZ_ENABLE_MOTIF
install:: $(PROGRAM)_motif
$(INSTALL) -m 555 $< $(DIST)/bin
endif
ifdef MOZ_ENABLE_QT
install:: $(PROGRAM)_qt
$(INSTALL) -m 555 $< $(DIST)/bin

3
mozilla/webshell/tests/viewer/unix/Makefile.in
View File

@ -34,9 +34,6 @@ DIRS =
ifdef MOZ_ENABLE_GTK
DIRS += gtk
endif
ifdef MOZ_ENABLE_MOTIF
DIRS += motif
endif
ifdef MOZ_ENABLE_QT
DIRS += qt
endif

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

@ -47,10 +47,6 @@ ifdef MOZ_ENABLE_GTK2
DIRS += gtk2
endif
ifdef MOZ_ENABLE_MOTIF
DIRS += motif
endif
ifdef MOZ_ENABLE_XLIB
DIRS += xlibxtbin
DIRS += xlib

4
mozilla/widget/timer/src/unix/Makefile.in
View File

@ -37,10 +37,6 @@ ifdef MOZ_ENABLE_GTK
DIRS += gtk
endif
ifdef MOZ_ENABLE_MOTIF
DIRS += motif
endif
ifdef MOZ_ENABLE_XLIB
DIRS += xlib
endif