mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-29 07:42:04 +00:00
General cleanup.
This commit is contained in:
briano%netscape.com
parent
6f11385254
commit
3bfa9ab2b4
@ -25,7 +25,8 @@ include $(DEPTH)/config/autoconf.mk
|
||||
DIRS = public src tests
|
||||
|
||||
ifdef MOZ_ENABLE_GTK_MOZILLA
|
||||
DIRS += embed
|
||||
DIRS += embed
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
||||
@ -23,30 +23,23 @@ VPATH = @srcdir@
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
ifdef MOZ_ENABLE_XLIB
|
||||
DIRS += xlib
|
||||
DIRS = xlib
|
||||
endif
|
||||
|
||||
ifdef MOZ_ENABLE_GTK_MOZILLA
|
||||
all:: export libs install
|
||||
|
||||
export depend::
|
||||
|
||||
libs::
|
||||
@cd gtk && $(MAKE) && cd ..
|
||||
|
||||
export::
|
||||
depend::
|
||||
|
||||
install::
|
||||
@cd gtk && $(MAKE) install && cd ..
|
||||
|
||||
clobber::
|
||||
clean clobber clobber_all distclean realclean::
|
||||
@cd gtk && $(MAKE) distclean && cd ..
|
||||
else
|
||||
all::
|
||||
export::
|
||||
libs::
|
||||
depend::
|
||||
install::
|
||||
clobber::
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
||||
@ -23,15 +23,16 @@ VPATH = @srcdir@
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
ifdef MOZ_ENABLE_GTK
|
||||
DIRS += gtk
|
||||
DIRS += gtk
|
||||
endif
|
||||
|
||||
ifdef MOZ_ENABLE_MOTIF
|
||||
DIRS += motif xt
|
||||
DIRS += motif xt
|
||||
endif
|
||||
|
||||
ifdef MOZ_ENABLE_QT
|
||||
DIRS += qt
|
||||
DIRS += qt
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
||||
@ -25,29 +25,22 @@ include $(DEPTH)/config/autoconf.mk
|
||||
PROGRAM = embed_xlib_into_gtk
|
||||
|
||||
CPPSRCS = \
|
||||
nsEmbedXlibIntoGtk.cpp \
|
||||
nsSetupRegistry.cpp \
|
||||
$(NULL)
|
||||
|
||||
BASE_LIBS = \
|
||||
-lmozjs \
|
||||
-lxpcom \
|
||||
$(NULL)
|
||||
|
||||
GECKO_LIBS = \
|
||||
-lraptorgfx \
|
||||
$(MOZ_TIMER_LIBS) \
|
||||
$(NULL)
|
||||
nsEmbedXlibIntoGtk.cpp \
|
||||
nsSetupRegistry.cpp \
|
||||
$(NULL)
|
||||
|
||||
LIBS = \
|
||||
$(GECKO_LIBS) \
|
||||
$(NETLIB_LIBS) \
|
||||
$(BASE_LIBS) \
|
||||
$(JSJ_LIB) \
|
||||
$(NSPR_LIBS) \
|
||||
$(MOZ_GTK_LDFLAGS) -lxlibrgb \
|
||||
$(NULL)
|
||||
-lraptorgfx \
|
||||
$(MOZ_TIMER_LIBS) \
|
||||
$(NETLIB_LIBS) \
|
||||
-lmozjs \
|
||||
-lxpcom \
|
||||
$(JSJ_LIB) \
|
||||
$(NSPR_LIBS) \
|
||||
$(MOZ_GTK_LDFLAGS) -lxlibrgb \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
CXXFLAGS += $(MOZ_GTK_CFLAGS)
|
||||
CXXFLAGS += $(MOZ_GTK_CFLAGS)
|
||||
|
||||
|
||||
@ -24,32 +24,23 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
PROGRAM = embed_xlib_into_motif
|
||||
|
||||
CSRCS = EmbedMozilla.c
|
||||
|
||||
CPPSRCS = \
|
||||
nsEmbedXlibIntoMotif.cpp \
|
||||
nsSetupRegistry.cpp \
|
||||
$(NULL)
|
||||
|
||||
CSRCS = \
|
||||
EmbedMozilla.c \
|
||||
$(NULL)
|
||||
|
||||
BASE_LIBS = \
|
||||
-lmozjs \
|
||||
-lxpcom \
|
||||
$(NULL)
|
||||
|
||||
GECKO_LIBS = \
|
||||
-lraptorgfx \
|
||||
$(MOZ_TIMER_LIBS) \
|
||||
$(NULL)
|
||||
nsEmbedXlibIntoMotif.cpp \
|
||||
nsSetupRegistry.cpp \
|
||||
$(NULL)
|
||||
|
||||
LIBS = \
|
||||
$(GECKO_LIBS) \
|
||||
$(NETLIB_LIBS) \
|
||||
$(BASE_LIBS) \
|
||||
$(JSJ_LIB) \
|
||||
$(NSPR_LIBS) \
|
||||
$(MOZ_MOTIF_LDFLAGS) -lxlibrgb \
|
||||
$(NULL)
|
||||
-lraptorgfx \
|
||||
$(MOZ_TIMER_LIBS) \
|
||||
$(NETLIB_LIBS) \
|
||||
-lmozjs \
|
||||
-lxpcom \
|
||||
$(JSJ_LIB) \
|
||||
$(NSPR_LIBS) \
|
||||
$(MOZ_MOTIF_LDFLAGS) -lxlibrgb \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
||||
@ -1,22 +1,22 @@
|
||||
#
|
||||
#
|
||||
# The contents of this file are subject to the Mozilla Public
|
||||
# License Version 1.1 (the "License"); you may not use this file
|
||||
# except in compliance with the License. You may obtain a copy of
|
||||
# the License at http://www.mozilla.org/MPL/
|
||||
#
|
||||
#
|
||||
# Software distributed under the License is distributed on an "AS
|
||||
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||
# implied. See the License for the specific language governing
|
||||
# rights and limitations under the License.
|
||||
#
|
||||
#
|
||||
# The Original Code is Mozilla Communicator client code.
|
||||
#
|
||||
#
|
||||
# The Initial Developer of the Original Code is Netscape Communications
|
||||
# Corporation. Portions created by Netscape are Copyright (C) 1998
|
||||
# Netscape Communications Corporation. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# Contributor(s):
|
||||
#
|
||||
|
||||
DEPTH = ../../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
@ -28,41 +28,34 @@ include $(DEPTH)/config/autoconf.mk
|
||||
PROGRAM = embed_xlib_into_qt
|
||||
|
||||
MOCSRCS = \
|
||||
moc_MainWidget.cpp \
|
||||
moc_QMozillaContainer.cpp \
|
||||
moc_nsQtEventProcessor.cpp \
|
||||
$(NULL)
|
||||
moc_MainWidget.cpp \
|
||||
moc_QMozillaContainer.cpp \
|
||||
moc_nsQtEventProcessor.cpp \
|
||||
$(NULL)
|
||||
|
||||
CPPSRCS = \
|
||||
$(MOCSRCS) \
|
||||
MainWidget.cpp \
|
||||
QMozillaContainer.cpp \
|
||||
nsEmbedXlibIntoQt.cpp \
|
||||
nsQtEventProcessor.cpp \
|
||||
nsSetupRegistry.cpp \
|
||||
$(NULL)
|
||||
|
||||
BASE_LIBS = \
|
||||
-lmozjs \
|
||||
-lxpcom \
|
||||
$(NULL)
|
||||
|
||||
GECKO_LIBS = \
|
||||
-lraptorgfx \
|
||||
$(MOZ_TIMER_LIBS) \
|
||||
$(NULL)
|
||||
$(MOCSRCS) \
|
||||
MainWidget.cpp \
|
||||
QMozillaContainer.cpp \
|
||||
nsEmbedXlibIntoQt.cpp \
|
||||
nsQtEventProcessor.cpp \
|
||||
nsSetupRegistry.cpp \
|
||||
$(NULL)
|
||||
|
||||
LIBS = \
|
||||
$(GECKO_LIBS) \
|
||||
$(NETLIB_LIBS) \
|
||||
$(BASE_LIBS) \
|
||||
$(JSJ_LIB) \
|
||||
$(NSPR_LIBS) \
|
||||
$(MOZ_QT_LDFLAGS) -lxlibrgb \
|
||||
$(NULL)
|
||||
-lraptorgfx \
|
||||
$(MOZ_TIMER_LIBS) \
|
||||
$(NETLIB_LIBS) \
|
||||
-lmozjs \
|
||||
-lxpcom \
|
||||
$(JSJ_LIB) \
|
||||
$(NSPR_LIBS) \
|
||||
$(MOZ_QT_LDFLAGS) -lxlibrgb \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
CXXFLAGS += $(MOZ_QT_CFLAGS)
|
||||
CXXFLAGS += $(MOZ_QT_CFLAGS)
|
||||
|
||||
INCLUDES += -I./
|
||||
|
||||
INCLUDES += -I./
|
||||
|
||||
@ -1,22 +1,22 @@
|
||||
#
|
||||
#
|
||||
# The contents of this file are subject to the Mozilla Public
|
||||
# License Version 1.1 (the "License"); you may not use this file
|
||||
# except in compliance with the License. You may obtain a copy of
|
||||
# the License at http://www.mozilla.org/MPL/
|
||||
#
|
||||
#
|
||||
# Software distributed under the License is distributed on an "AS
|
||||
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||
# implied. See the License for the specific language governing
|
||||
# rights and limitations under the License.
|
||||
#
|
||||
#
|
||||
# The Original Code is Mozilla Communicator client code.
|
||||
#
|
||||
#
|
||||
# The Initial Developer of the Original Code is Netscape Communications
|
||||
# Corporation. Portions created by Netscape are Copyright (C) 1998
|
||||
# Netscape Communications Corporation. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# Contributor(s):
|
||||
#
|
||||
|
||||
DEPTH = ../../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
@ -27,34 +27,25 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
PROGRAM = embed_xlib_into_xt
|
||||
|
||||
CSRCS = \
|
||||
EmbedMozilla.c \
|
||||
$(NULL)
|
||||
CSRCS = EmbedMozilla.c
|
||||
|
||||
CPPSRCS = \
|
||||
nsEmbedXlibIntoXt.cpp \
|
||||
nsSetupRegistry.cpp \
|
||||
$(NULL)
|
||||
|
||||
BASE_LIBS = \
|
||||
-lmozjs \
|
||||
-lxpcom \
|
||||
$(NULL)
|
||||
|
||||
GECKO_LIBS = \
|
||||
-lraptorgfx \
|
||||
$(MOZ_TIMER_LIBS) \
|
||||
$(NULL)
|
||||
nsEmbedXlibIntoXt.cpp \
|
||||
nsSetupRegistry.cpp \
|
||||
$(NULL)
|
||||
|
||||
LIBS = \
|
||||
$(GECKO_LIBS) \
|
||||
$(NETLIB_LIBS) \
|
||||
$(BASE_LIBS) \
|
||||
$(JSJ_LIB) \
|
||||
$(NSPR_LIBS) \
|
||||
$(MOZ_MOTIF_LDFLAGS) -lxlibrgb \
|
||||
$(NULL)
|
||||
-lraptorgfx \
|
||||
$(MOZ_TIMER_LIBS) \
|
||||
$(NETLIB_LIBS) \
|
||||
-lmozjs \
|
||||
-lxpcom \
|
||||
$(JSJ_LIB) \
|
||||
$(NSPR_LIBS) \
|
||||
$(MOZ_MOTIF_LDFLAGS) -lxlibrgb \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
CXXFLAGS += $(MOZ_MOTIF_CFLAGS)
|
||||
CXXFLAGS += $(MOZ_MOTIF_CFLAGS)
|
||||
|
||||
|
||||
@ -26,14 +26,14 @@ MODULE = raptor
|
||||
LIBRARY_NAME = raptorwebwidget
|
||||
|
||||
CPPSRCS = \
|
||||
dlldeps.cpp \
|
||||
nsDLLFactory.cpp \
|
||||
nsDocLoader.cpp \
|
||||
nsThrobber.cpp \
|
||||
nsWebShell.cpp \
|
||||
$(NULL)
|
||||
dlldeps.cpp \
|
||||
nsDLLFactory.cpp \
|
||||
nsDocLoader.cpp \
|
||||
nsThrobber.cpp \
|
||||
nsWebShell.cpp \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DSO_LDOPTS =\
|
||||
EXTRA_DSO_LDOPTS = \
|
||||
$(MOZ_NECKO_UTIL_LIBS) \
|
||||
$(MOZ_TIMER_LIBS) \
|
||||
-L$(DIST)/bin \
|
||||
|
||||
@ -26,8 +26,6 @@ DIRS = public
|
||||
|
||||
PROGRAM = viewer
|
||||
|
||||
RUN_VIEWER_SCRIPT = $(srcdir)/mozilla-viewer.sh
|
||||
|
||||
CPPSRCS = \
|
||||
$(TOOLKIT_CPPSRCS) \
|
||||
nsBaseDialog.cpp \
|
||||
@ -96,13 +94,13 @@ XP_DIST_LIBS = \
|
||||
$(JSJ_LIB) \
|
||||
$(NULL)
|
||||
|
||||
XP_NS_UNDERBAR_CRAP = \
|
||||
XP_NS_UNDERBAR_CRAP = \
|
||||
$(MOZ_NECKO_UTIL_LIBS) \
|
||||
$(MOZ_TIMER_LIBS) \
|
||||
$(MOZ_WIDGET_SUPPORT_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
XP_LIBS = \
|
||||
XP_LIBS = \
|
||||
$(XP_NS_UNDERBAR_CRAP) \
|
||||
$(XP_DIST_LIBS) \
|
||||
$(NSPR_LIBS) \
|
||||
@ -123,23 +121,21 @@ 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 $(XP_LIBS) $(MOZ_GTK_LDFLAGS)
|
||||
|
||||
# cls/shaver are responsible for this amazingness
|
||||
EXTRA_DEPS = \
|
||||
$(addprefix $(DIST)/,$(patsubst -l%,bin/lib%.$(DLL_SUFFIX),$(XP_DIST_LIBS:-l%_s=lib/lib%_s.a))) \
|
||||
$(UNIX_VIEWER_TK_LIBS) \
|
||||
$(XP_NS_UNDERBAR_CRAP) \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DEPS += $(XP_NS_UNDERBAR_CRAP)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
CXXFLAGS += $(MOZ_TOOLKIT_REGISTRY_CFLAGS)
|
||||
|
||||
install:: $(PROGRAM) $(RUN_VIEWER_SCRIPT)
|
||||
install:: $(PROGRAM) $(srcdir)/mozilla-viewer.sh
|
||||
$(INSTALL) $(EXPORT_RESOURCE_SAMPLES) $(DIST)/bin/res/samples
|
||||
$(INSTALL) $(EXPORT_RESOURCE_THROBBER) $(DIST)/bin/res/throbber
|
||||
$(INSTALL) $(srcdir)/resources/viewer.properties $(DIST)/bin/res
|
||||
$(INSTALL) $(RUN_VIEWER_SCRIPT) $(DIST)/bin
|
||||
$(INSTALL) $(srcdir)/mozilla-viewer.sh $(DIST)/bin
|
||||
|
||||
$(PROGRAM)_gtk: $(PROGOBJS) $(EXTRA_DEPS) Makefile Makefile.in $(DIST)/lib/libviewer_gtk_s.a
|
||||
$(CCC) -o $@ $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(GTK_LIBS) $(OS_LIBS)
|
||||
@ -173,5 +169,3 @@ install:: $(PROGRAM)_xlib
|
||||
$(INSTALL) -m 555 $< $(DIST)/bin
|
||||
endif
|
||||
|
||||
caca:
|
||||
@echo $(EXTRA_DEPS)
|
||||
|
||||
@ -35,8 +35,9 @@ override NO_STATIC_LIB=
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
INCLUDES += -I$(srcdir)/../..
|
||||
|
||||
ifeq ($(OS_ARCH), Linux)
|
||||
DEFINES += -D_XOPEN_SOURCE=500
|
||||
DEFINES += -D_XOPEN_SOURCE=500
|
||||
endif
|
||||
|
||||
ifndef MOZ_MONOLITHIC_TOOLKIT
|
||||
@ -44,3 +45,4 @@ CXXFLAGS += $(MOZ_GTK_CFLAGS)
|
||||
else
|
||||
CXXFLAGS += $(TK_CFLAGS)
|
||||
endif
|
||||
|
||||
|
||||
@ -34,14 +34,15 @@ override NO_STATIC_LIB=
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifeq ($(OS_ARCH), Linux)
|
||||
DEFINES += -D_XOPEN_SOURCE=500
|
||||
endif
|
||||
|
||||
INCLUDES += -I$(srcdir)/../..
|
||||
|
||||
ifeq ($(OS_ARCH), Linux)
|
||||
DEFINES += -D_XOPEN_SOURCE=500
|
||||
endif
|
||||
|
||||
ifndef MOZ_MONOLITHIC_TOOLKIT
|
||||
CXXFLAGS += $(MOZ_MOTIF_CFLAGS)
|
||||
else
|
||||
CXXFLAGS += $(TK_CFLAGS)
|
||||
endif
|
||||
|
||||
|
||||
@ -35,14 +35,15 @@ override NO_STATIC_LIB=
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifeq ($(OS_ARCH), Linux)
|
||||
DEFINES += -D_XOPEN_SOURCE=500
|
||||
endif
|
||||
|
||||
INCLUDES += -I$(srcdir)/../..
|
||||
|
||||
ifeq ($(OS_ARCH), Linux)
|
||||
DEFINES += -D_XOPEN_SOURCE=500
|
||||
endif
|
||||
|
||||
ifndef MOZ_MONOLITHIC_TOOLKIT
|
||||
CXXFLAGS += $(MOZ_QT_CFLAGS)
|
||||
else
|
||||
CXXFLAGS += $(TK_CFLAGS)
|
||||
endif
|
||||
|
||||
|
||||
@ -24,23 +24,22 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
LIBRARY_NAME = viewer_xlib_s
|
||||
|
||||
CPPSRCS = \
|
||||
nsXlibMain.cpp \
|
||||
$(NULL)
|
||||
CPPSRCS = nsXlibMain.cpp
|
||||
|
||||
override NO_SHARED_LIB=1
|
||||
override NO_STATIC_LIB=
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifeq ($(OS_ARCH), Linux)
|
||||
DEFINES += -D_XOPEN_SOURCE=500
|
||||
endif
|
||||
|
||||
INCLUDES += -I$(srcdir)/../..
|
||||
|
||||
ifeq ($(OS_ARCH), Linux)
|
||||
DEFINES += -D_XOPEN_SOURCE=500
|
||||
endif
|
||||
|
||||
ifndef MOZ_MONOLITHIC_TOOLKIT
|
||||
CXXFLAGS += $(MOZ_XLIB_CFLAGS)
|
||||
else
|
||||
CXXFLAGS += $(TK_CFLAGS)
|
||||
endif
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user