mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Followup to removal of --enable-monolithic-toolkit..remove MOZ_MONOLITHIC_TOOLKIT ifdefs

This commit is contained in:
seawood%netscape.com 2001-10-27 05:49:30 +00:00
Родитель faf03ce445
Коммит 3e1cbb069d
25 изменённых файлов: 12 добавлений и 181 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
embedding/browser/gtk/src/Makefile.in
Просмотреть файл

@ -71,11 +71,7 @@ EXTRA_DSO_LDOPTS = \
-lgtksuperwin \
$(NULL)
ifndef MOZ_MONOLITHIC_TOOLKIT
EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS)
else
EXTRA_DSO_LDOPTS += $(TK_LIBS)
endif
include $(topsrcdir)/config/rules.mk

4
embedding/browser/photon/src/Makefile.in
Просмотреть файл

@ -79,11 +79,7 @@ EXTRA_DSO_LDOPTS = \
$(MOZ_COMPONENT_LIBS) \
$(NULL)
ifndef MOZ_MONOLITHIC_TOOLKIT
EXTRA_DSO_LDOPTS += $(MOZ_PH_LDFLAGS)
else
EXTRA_DSO_LDOPTS += $(TK_LIBS)
endif
include $(topsrcdir)/config/rules.mk

9
gfx/src/Makefile.in
Просмотреть файл

@ -48,15 +48,15 @@ else
DIRS = ps
endif
ifneq (,$(filter beos os2 mac,$(MOZ_GFX_TOOLKIT)))
DIRS += $(MOZ_GFX_TOOLKIT)
endif
# Build xlibrgb only for X toolkits and/or Xprint
ifneq (,$(filter xlib,$(MOZ_WIDGET_TOOLKIT))$(MOZ_ENABLE_XLIB)$(MOZ_ENABLE_XPRINT))
DIRS += xlibrgb
endif
ifdef MOZ_MONOLITHIC_TOOLKIT
DIRS += $(MOZ_GFX_TOOLKIT)
else
ifdef MOZ_ENABLE_GTK
DIRS += gtk
endif
@ -73,7 +73,6 @@ endif
ifdef MOZ_ENABLE_PHOTON
DIRS += photon
endif
endif
ifdef MOZ_ENABLE_XPRINT
DIRS += xprint

6
gfx/src/gtk/Makefile.in
Просмотреть файл

@ -65,15 +65,9 @@ CPPSRCS = \
include $(topsrcdir)/config/rules.mk
ifndef MOZ_MONOLITHIC_TOOLKIT
EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS)
CXXFLAGS += $(MOZ_GTK_CFLAGS)
CFLAGS += $(MOZ_GTK_CFLAGS)
else
EXTRA_DSO_LDOPTS += $(TK_LIBS)
CXXFLAGS += $(TK_CFLAGS)
CFLAGS += $(TK_CFLAGS)
endif
ifdef MOZ_ENABLE_XINERAMA
GFX_XINERAMA_LIBS += $(MOZ_XINERAMA_LIBS)

6
gfx/src/qt/Makefile.in
Просмотреть файл

@ -66,15 +66,9 @@ CPPSRCS = \
include $(topsrcdir)/config/rules.mk
ifndef MOZ_MONOLITHIC_TOOLKIT
EXTRA_DSO_LDOPTS += $(MOZ_QT_LDFLAGS)
CXXFLAGS += $(MOZ_QT_CFLAGS)
CFLAGS += $(MOZ_QT_CFLAGS)
else
EXTRA_DSO_LDOPTS += $(TK_LIBS)
CXXFLAGS += $(TK_CFLAGS)
CFLAGS += $(TK_CFLAGS)
endif
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) \
-lgkgfx \

5
gfx/src/xlib/Makefile.in
Просмотреть файл

@ -78,13 +78,8 @@ endif
include $(topsrcdir)/config/rules.mk
ifndef MOZ_MONOLITHIC_TOOLKIT
EXTRA_DSO_LDOPTS += -L$(DIST)/bin -lxlibrgb $(MOZ_XLIB_LDFLAGS)
CXXFLAGS += $(MOZ_XLIB_CFLAGS)
else
EXTRA_DSO_LDOPTS += $(TK_LIBS)
CXXFLAGS += $(TK_CFLAGS)
endif
ifdef HAVE_XIE
DEFINES += -DHAVE_XIE

21
modules/plugin/base/src/Makefile.in
Просмотреть файл

@ -94,36 +94,19 @@ EXTRA_DSO_LDOPTS = \
$(MOZ_COMPONENT_LIBS) \
$(NULL)
ifndef MOZ_MONOLITHIC_TOOLKIT
EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS)
else
EXTRA_DSO_LDOPTS += $(TK_LIBS)
endif
include $(topsrcdir)/config/rules.mk
DEFINES += -D_IMPL_NS_PLUGIN
ifdef MOZ_ENABLE_GTK
ifndef MOZ_MONOLITHIC_TOOLKIT
CXXFLAGS += $(MOZ_GTK_CFLAGS)
CFLAGS += $(MOZ_GTK_CFLAGS)
EXTRA_DSO_LDOPTS += -lgtkxtbin -lgtksuperwin -L/usr/X11R6/lib -lXt
else
CXXFLAGS += $(TK_CFLAGS)
CFLAGS += $(TK_CFLAGS)
EXTRA_DSO_LDOPTS += -lgtkxtbin -lgtksuperwin -L/usr/X11R6/lib -lXt
endif #MOZ_MONOLITHIC_TOOLKIT
EXTRA_DSO_LDOPTS += -lgtkxtbin -lgtksuperwin -L/usr/X11R6/lib -lXt $(MOZ_GTK_LDFLAGS)
endif #MOZ_ENABLE_GTK
ifdef MOZ_ENABLE_QT
EXTRA_DSO_LDOPTS += $(MOZ_QT_LDFLAGS)
ifndef MOZ_MONOLITHIC_TOOLKIT
CXXFLAGS += $(MOZ_QT_CFLAGS)
CFLAGS += $(MOZ_QT_CFLAGS)
else
CXXFLAGS += $(TK_CFLAGS)
CFLAGS += $(TK_CFLAGS)
endif #MOZ_MONOLITHIC_TOOLKIT
endif #MOZ_ENABLE_QT

6
modules/plugin/samples/default/unix/Makefile.in
Просмотреть файл

@ -51,14 +51,10 @@ include $(topsrcdir)/config/rules.mk
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) -lXt \
$(NULL)
ifndef MOZ_MONOLITHIC_TOOLKIT
ifdef MOZ_ENABLE_GTK
EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS)
CXXFLAGS += $(MOZ_GTK_CFLAGS)
CFLAGS += $(MOZ_GTK_CFLAGS)
else
EXTRA_DSO_LDOPTS += $(TK_LIBS)
CXXFLAGS += $(TK_CFLAGS)
CFLAGS += $(TK_CFLAGS)
endif
install-plugin: $(SHARED_LIBRARY)

5
webshell/tests/viewer/unix/Makefile.in
Просмотреть файл

@ -26,9 +26,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
ifdef MOZ_MONOLITHIC_TOOLKIT
DIRS = $(MOZ_WIDGET_TOOLKIT)
else
DIRS =
ifdef MOZ_ENABLE_GTK
@ -41,7 +38,5 @@ ifdef MOZ_ENABLE_XLIB
DIRS += xlib
endif
endif
include $(topsrcdir)/config/rules.mk

4
webshell/tests/viewer/unix/gtk/Makefile.in
Просмотреть файл

@ -67,9 +67,5 @@ DEFINES += -D_TIME_H=1
endif
endif
ifndef MOZ_MONOLITHIC_TOOLKIT
CXXFLAGS += $(MOZ_GTK_CFLAGS)
else
CXXFLAGS += $(TK_CFLAGS)
endif

4
webshell/tests/viewer/unix/qt/Makefile.in
Просмотреть файл

@ -62,9 +62,5 @@ ifeq ($(OS_ARCH), Linux)
DEFINES += -D_XOPEN_SOURCE=500
endif
ifndef MOZ_MONOLITHIC_TOOLKIT
CXXFLAGS += $(MOZ_QT_CFLAGS)
else
CXXFLAGS += $(TK_CFLAGS)
endif

4
webshell/tests/viewer/unix/xlib/Makefile.in
Просмотреть файл

@ -61,9 +61,5 @@ ifeq ($(OS_ARCH), Linux)
DEFINES += -D_XOPEN_SOURCE=500
endif
ifndef MOZ_MONOLITHIC_TOOLKIT
CXXFLAGS += $(MOZ_XLIB_CFLAGS)
else
CXXFLAGS += $(TK_CFLAGS)
endif

14
widget/src/Makefile.in
Просмотреть файл

@ -28,6 +28,10 @@ include $(DEPTH)/config/autoconf.mk
DIRS = xpwidgets support
ifneq (,$(filter beos os2 mac,$(MOZ_WIDGET_TOOLKIT)))
DIRS += $(MOZ_WIDGET_TOOLKIT)
endif
#
# Dont build the DSO under the 'build' directory as windows does.
#
@ -35,8 +39,6 @@ DIRS = xpwidgets support
# multiple implementations of widget can be built on the same
# source tree.
#
ifndef MOZ_MONOLITHIC_TOOLKIT
ifdef MOZ_ENABLE_GTK
DIRS += gtksuperwin
DIRS += gtkxtbin
@ -64,13 +66,5 @@ ifdef MOZ_ENABLE_XREMOTE
DIRS += xremoteclient
endif
else
ifdef MOZ_ENABLE_GTK
DIRS += gtkxtbin
DIRS += gtksuperwin
endif
DIRS += $(MOZ_WIDGET_TOOLKIT)
endif
include $(topsrcdir)/config/rules.mk

9
widget/src/gtk/Makefile.in
Просмотреть файл

@ -76,21 +76,12 @@ EXTRA_DSO_LDOPTS = \
$(MOZ_JS_LIBS) \
$(NULL)
ifndef MOZ_MONOLITHIC_TOOLKIT
EXTRA_DSO_LDOPTS += -L$(DIST)/lib -lgtksuperwin $(MOZ_GTK_LDFLAGS)
else
EXTRA_DSO_LDOPTS += -L$(DIST)/lib -lgtksuperwin $(TK_LIBS)
endif
include $(topsrcdir)/config/rules.mk
ifndef MOZ_MONOLITHIC_TOOLKIT
CXXFLAGS += $(MOZ_GTK_CFLAGS)
CFLAGS += $(MOZ_GTK_CFLAGS)
else
CXXFLAGS += $(TK_CFLAGS)
CFLAGS += $(TK_CFLAGS)
endif
DEFINES += -D_IMPL_NS_WIDGET -DUSE_XIM

8
widget/src/gtksuperwin/Makefile.in
Просмотреть файл

@ -33,11 +33,7 @@ CSRCS = \
gtkmozbox.c
ifndef MOZ_MONOLITHIC_TOOLKIT
EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS)
else
EXTRA_DSO_LDOPTS += $(TK_LIBS)
endif
EXPORTS = gdksuperwin.h \
gtkmozarea.h \
@ -45,11 +41,7 @@ EXPORTS = gdksuperwin.h \
include $(topsrcdir)/config/rules.mk
ifndef MOZ_MONOLITHIC_TOOLKIT
CFLAGS += $(MOZ_GTK_CFLAGS)
else
CFLAGS += $(TK_CFLAGS)
endif
DEFINES += -D_IMPL_NS_WIDGET -DUSE_XIM

8
widget/src/gtkxtbin/Makefile.in
Просмотреть файл

@ -33,21 +33,13 @@ EXPORT_LIBRARY = 1
CSRCS = \
gtkxtbin.c \
ifndef MOZ_MONOLITHIC_TOOLKIT
EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS) -lXt
else
EXTRA_DSO_LDOPTS += $(TK_LIBS) -lXt
endif
EXPORTS = gtkxtbin.h
include $(topsrcdir)/config/rules.mk
ifndef MOZ_MONOLITHIC_TOOLKIT
CFLAGS += $(MOZ_GTK_CFLAGS)
else
CFLAGS += $(TK_CFLAGS)
endif
DEFINES += -D_IMPL_NS_WIDGET -DUSE_XIM

9
widget/src/qt/Makefile.in
Просмотреть файл

@ -77,21 +77,12 @@ EXTRA_DSO_LDOPTS = \
$(MOZ_JS_LIBS) \
$(NULL)
ifndef MOZ_MONOLITHIC_TOOLKIT
EXTRA_DSO_LDOPTS += -L$(DIST)/lib $(MOZ_QT_LDFLAGS) $(MOZ_XLIB_LDFLAGS)
else
EXTRA_DSO_LDOPTS += -L$(DIST)/lib $(TK_LIBS)
endif
include $(topsrcdir)/config/rules.mk
ifndef MOZ_MONOLITHIC_TOOLKIT
CXXFLAGS += $(MOZ_QT_CFLAGS)
CFLAGS += $(MOZ_QT_CFLAGS)
else
CXXFLAGS += $(TK_CFLAGS)
CFLAGS += $(TK_CFLAGS)
endif
DEFINES += -D_IMPL_NS_WIDGET

8
widget/src/xlib/Makefile.in
Просмотреть файл

@ -83,17 +83,9 @@ include $(topsrcdir)/config/rules.mk
EXTRA_DSO_LDOPTS += -L$(DIST)/bin -L$(DIST)/lib -lgkgfx $(MOZ_COMPONENT_LIBS)
ifndef MOZ_MONOLITHIC_TOOLKIT
EXTRA_DSO_LDOPTS += -L$(DIST)/bin -lXt -lxlibrgb -lxlibxtbin $(MOZ_XLIB_LDFLAGS)
else
EXTRA_DSO_LDOPTS += $(TK_LIBS)
endif
ifndef MOZ_MONOLITHIC_TOOLKIT
CXXFLAGS += $(MOZ_XLIB_CFLAGS)
else
CXXFLAGS += $(TK_CFLAGS)
endif
DEFINES += -D_IMPL_NS_WIDGET

8
widget/src/xlibxtbin/Makefile.in
Просмотреть файл

@ -36,21 +36,13 @@ CPPSRCS = \
EXTRA_DSO_LDOPTS += -L$(DIST)/bin -L$(DIST)/lib -lxlibrgb
ifndef MOZ_MONOLITHIC_TOOLKIT
EXTRA_DSO_LDOPTS += $(MOZ_XLIB_LDFLAGS) -L/usr/X11R6/lib -lXt
else
EXTRA_DSO_LDOPTS += $(TK_LIBS) -L/usr/X11R6/lib -lXt
endif
EXPORTS = xlibxtbin.h
include $(topsrcdir)/config/rules.mk
ifndef MOZ_MONOLITHIC_TOOLKIT
CFLAGS += $(MOZ_XLIB_CFLAGS)
else
CFLAGS += $(TK_CFLAGS)
endif
DEFINES += -D_IMPL_NS_WIDGET -DUSE_XIM

6
widget/timer/src/unix/Makefile.in
Просмотреть файл

@ -29,10 +29,6 @@ include $(DEPTH)/config/autoconf.mk
MODULE = timer
EXPORTS = nsUnixTimerCIID.h
ifdef MOZ_MONOLITHIC_TOOLKIT
DIRS = $(MOZ_WIDGET_TOOLKIT)
else
ifdef MOZ_ENABLE_GTK
DIRS += gtk
endif
@ -49,7 +45,5 @@ ifdef MOZ_ENABLE_PHOTON
DIRS += photon
endif
endif
include $(topsrcdir)/config/rules.mk

10
widget/timer/src/unix/gtk/Makefile.in
Просмотреть файл

@ -34,24 +34,14 @@ REQUIRES = xpcom \
CPPSRCS = nsTimerGtk.cpp
ifndef MOZ_MONOLITHIC_TOOLKIT
EXPORT_LIBRARY = 1
TIMER_SUFFIX = gtk
IS_COMPONENT = 1
MODULE_NAME = nsGtkTimerModule
CPPSRCS += nsTimerGtkFactory.cpp
EXTRA_DSO_LDOPTS = $(MOZ_GTK_LDFLAGS) $(MOZ_COMPONENT_LIBS)
else
TIMER_SUFFIX = s
FORCE_STATIC_LIB = 1
endif
include $(topsrcdir)/config/rules.mk
ifndef MOZ_MONOLITHIC_TOOLKIT
INCLUDES += $(MOZ_GTK_CFLAGS) -I$(srcdir)/..
else
CXXFLAGS += $(TK_CFLAGS)
INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..
endif

10
widget/timer/src/unix/photon/Makefile.in
Просмотреть файл

@ -34,24 +34,14 @@ REQUIRES = xpcom \
CPPSRCS = nsTimerPh.cpp
ifndef MOZ_MONOLITHIC_TOOLKIT
TIMER_SUFFIX = photon
IS_COMPONENT = 1
EXPORT_LIBRARY = 1
MODULE_NAME = nsPhTimerModule
CPPSRCS += nsTimerPhFactory.cpp
EXTRA_DSO_LDOPTS = $(MOZ_COMPONENT_LIBS)
else
TIMER_SUFFIX = s
FORCE_STATIC_LIB = 1
endif
include $(topsrcdir)/config/rules.mk
ifndef MOZ_MONOLITHIC_TOOLKIT
INCLUDES += $(MOZ_PH_CFLAGS) -I$(srcdir)/..
else
CXXFLAGS += $(TK_CFLAGS)
INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..
endif

11
widget/timer/src/unix/qt/Makefile.in
Просмотреть файл

@ -41,23 +41,14 @@ MOCSRCS = \
moc_nsTimerEventHandler.cpp \
$(NULL)
ifndef MOZ_MONOLITHIC_TOOLKIT
EXPORT_LIBRARY = 1
TIMER_SUFFIX = qt
IS_COMPONENT = 1
MODULE_NAME = nsQtTimerModule
CPPSRCS += nsTimerQtFactory.cpp
EXTRA_DSO_LDOPTS = $(MOZ_QT_LDFLAGS) $(MOZ_COMPONENT_LIBS)
else
TIMER_SUFFIX = s
FORCE_STATIC_LIB = 1
endif
include $(topsrcdir)/config/rules.mk
ifndef MOZ_MONOLITHIC_TOOLKIT
INCLUDES += $(MOZ_QT_CFLAGS) -I$(srcdir)/..
else
CXXFLAGS += $(TK_CFLAGS)
INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..
endif

10
widget/timer/src/unix/xlib/Makefile.in
Просмотреть файл

@ -35,24 +35,14 @@ REQUIRES = xpcom \
CPPSRCS = nsTimerXlib.cpp
ifndef MOZ_MONOLITHIC_TOOLKIT
EXPORT_LIBRARY = 1
TIMER_SUFFIX = xlib
IS_COMPONENT = 1
MODULE_NAME = nsXlibTimerModule
CPPSRCS += nsTimerXlibFactory.cpp
EXTRA_DSO_LDOPTS = $(MOZ_XLIB_LDFLAGS) $(MOZ_COMPONENT_LIBS)
else
TIMER_SUFFIX = s
FORCE_STATIC_LIB = 1
endif
include $(topsrcdir)/config/rules.mk
ifndef MOZ_MONOLITHIC_TOOLKIT
INCLUDES += $(MOZ_XLIB_CFLAGS) -I$(srcdir)/..
else
CXXFLAGS += $(TK_CFLAGS)
INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..
endif

4
xpfe/bootstrap/Makefile.in
Просмотреть файл

@ -149,10 +149,6 @@ ifdef MOZ_ENABLE_PHOTON
XP_LIBS += $(TK_LIBS)
endif
ifdef MOZ_MONOLITHIC_TOOLKIT
XP_LIBS += $(TK_LIBS)
endif
ifdef NS_TRACE_MALLOC
DEFINES += -DNS_TRACE_MALLOC
endif