Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-31 19:10:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Dropping build infrastructure for supporting building with mulitple toolkits.

Browse Source 
Bug #191528 r=pavlov
This commit is contained in:
seawood%netscape.com 2003-02-28 22:02:21 +00:00
parent dea34bb74a
commit c73a696f3b
7 changed files with 552 additions and 732 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
config/rules.mk
View File

@ -401,17 +401,6 @@ ifdef IS_COMPONENT
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS)
endif # IS_COMPONENT
#
# Allow components to be installed into a secondary path
# that is not searched by xpcom.
ifndef COMPONENTS_PATH
ifdef INACTIVE_COMPONENT
COMPONENTS_PATH = components_inactive
else
COMPONENTS_PATH = components
endif
endif
#
# MacOS X specific stuff
#
@ -616,7 +605,7 @@ ifndef NO_DIST_INSTALL
ifneq (,$(BUILD_STATIC_LIBS)$(FORCE_STATIC_LIB))
ifdef LIBRARY
ifdef IS_COMPONENT
$(INSTALL) $(IFLAGS1) $(LIBRARY) $(DIST)/lib/$(COMPONENTS_PATH)
$(INSTALL) $(IFLAGS1) $(LIBRARY) $(DIST)/lib/components
else
$(INSTALL) $(IFLAGS1) $(LIBRARY) $(DIST)/lib
endif
@ -629,24 +618,24 @@ ifdef SHARED_LIBRARY
ifdef IS_COMPONENT
ifdef GRE_MODULE
ifndef DISABLE_DIST_GRE
$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(GRE_DIST)/$(COMPONENTS_PATH)
$(ELF_DYNSTR_GC) $(GRE_DIST)/$(COMPONENTS_PATH)/$(SHARED_LIBRARY)
$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(GRE_DIST)/components
$(ELF_DYNSTR_GC) $(GRE_DIST)/components/$(SHARED_LIBRARY)
ifdef BEOS_ADDON_WORKAROUND
( cd $(GRE_DIST)/$(COMPONENTS_PATH) && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) )
( cd $(GRE_DIST)/components && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) )
endif
endif
endif # GRE_MODULE
ifeq ($(OS_ARCH),OS2)
$(INSTALL) $(IFLAGS2) $(IMPORT_LIBRARY) $(DIST)/lib/$(COMPONENTS_PATH)
$(INSTALL) $(IFLAGS2) $(IMPORT_LIBRARY) $(DIST)/lib/components
else
$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DIST)/lib/$(COMPONENTS_PATH)
$(ELF_DYNSTR_GC) $(DIST)/lib/$(COMPONENTS_PATH)/$(SHARED_LIBRARY)
$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DIST)/lib/components
$(ELF_DYNSTR_GC) $(DIST)/lib/components/$(SHARED_LIBRARY)
endif
ifndef _SKIP_OLD_GRE_INSTALL
$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DIST)/bin/$(COMPONENTS_PATH)
$(ELF_DYNSTR_GC) $(DIST)/bin/$(COMPONENTS_PATH)/$(SHARED_LIBRARY)
$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DIST)/bin/components
$(ELF_DYNSTR_GC) $(DIST)/bin/components/$(SHARED_LIBRARY)
ifdef BEOS_ADDON_WORKAROUND
( cd $(DIST)/bin/$(COMPONENTS_PATH) && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) )
( cd $(DIST)/bin/components && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) )
endif
endif # ! _SKIP_OLD_GRE_INSTALL
else # ! IS_COMPONENT
@ -728,9 +717,9 @@ ifndef NO_INSTALL
ifdef SHARED_LIBRARY
ifdef IS_COMPONENT
ifdef MRE_DIST
$(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mredir)/$(COMPONENTS_PATH)
$(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mredir)/components
else
$(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mozappdir)/$(COMPONENTS_PATH)
$(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mozappdir)/components
endif
else
ifdef MRE_DIST
@ -1323,20 +1312,20 @@ libs:: $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt
ifndef NO_DIST_INSTALL
ifdef GRE_MODULE
ifndef DISABLE_DIST_GRE
$(INSTALL) $(IFLAGS1) $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt $(GRE_DIST)/$(COMPONENTS_PATH)
$(INSTALL) $(IFLAGS1) $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt $(GRE_DIST)/components
endif
endif
ifndef _SKIP_OLD_GRE_INSTALL
$(INSTALL) $(IFLAGS1) $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt $(DIST)/bin/$(COMPONENTS_PATH)
$(INSTALL) $(IFLAGS1) $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt $(DIST)/bin/components
endif
endif
install:: $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt
ifndef NO_INSTALL
ifdef MRE_DIST
$(SYSINSTALL) $(IFLAGS1) $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt $(DESTDIR)$(mredir)/$(COMPONENTS_PATH)
$(SYSINSTALL) $(IFLAGS1) $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt $(DESTDIR)$(mredir)/components
else
$(SYSINSTALL) $(IFLAGS1) $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt $(DESTDIR)$(mozappdir)/$(COMPONENTS_PATH)
$(SYSINSTALL) $(IFLAGS1) $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt $(DESTDIR)$(mozappdir)/components
endif
endif # NO_INSTALL
endif # NO_GEN_XPT

1199
configure vendored
View File

File diff suppressed because it is too large Load Diff

20
configure.in
View File

@ -3027,26 +3027,6 @@ MOZ_ARG_HEADER(Toolkit Options)
fi
fi
if test "$no_x" != "yes"; then
dnl ========================================================
dnl = Gtk support hackery =
dnl ========================================================
MOZ_ARG_ENABLE_BOOL(toolkit-gtk,
[ --enable-toolkit-gtk Enable GTK+ toolkit support ],
MOZ_ENABLE_GTK=1,
MOZ_ENABLE_GTK= )
dnl ========================================================
dnl = Xlib support hackery =
dnl ========================================================
MOZ_ARG_ENABLE_BOOL(toolkit-xlib,
[ --enable-toolkit-xlib Enable xlib toolkit support ],
MOZ_ENABLE_XLIB=1,
MOZ_ENABLE_XLIB= )
fi # !no_x
AC_DEFINE_UNQUOTED(MOZ_DEFAULT_TOOLKIT,"$MOZ_WIDGET_TOOLKIT")
dnl ========================================================

7
gfx/src/gtk/Makefile.in
View File

@ -116,13 +116,6 @@ CPPSRCS += \
$(NULL)
endif
# If not primary toolkit, install in secondary path
ifneq (gtk,$(MOZ_GFX_TOOLKIT))
ifneq (gtk2, $(MOZ_GFX_TOOLKIT))
INACTIVE_COMPONENT = 1
endif
endif
ifdef MOZ_ENABLE_XPRINT
XPU_LCSRCS = xprintutil.c
CSRCS += $(XPU_LCSRCS)

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

@ -83,11 +83,6 @@ ifdef HAVE_XIE
CSRCS += XIE.c
endif
# If not primary toolkit, install in secondary path
ifneq (xlib,$(MOZ_GFX_TOOLKIT))
INACTIVE_COMPONENT = 1
endif
ifdef MOZ_ENABLE_XPRINT
XPU_LCSRCS = xprintutil.c
CSRCS += $(XPU_LCSRCS)

5
widget/src/gtk/Makefile.in
View File

@ -90,11 +90,6 @@ EXTRA_DSO_LDOPTS = \
EXTRA_DSO_LDOPTS += -L$(DIST)/lib -lgtksuperwin $(MOZ_GTK_LDFLAGS)
# If not primary toolkit, install in secondary path
ifneq (gtk,$(MOZ_WIDGET_TOOLKIT))
INACTIVE_COMPONENT = 1
endif
include $(topsrcdir)/config/rules.mk
CXXFLAGS += $(MOZ_GTK_CFLAGS)

5
widget/src/xlib/Makefile.in
View File

@ -74,11 +74,6 @@ CPPSRCS = \
SHARED_LIBRARY_LIBS = $(DIST)/lib/libxpwidgets_s.a
# If not primary toolkit, install in secondary path
ifneq (xlib,$(MOZ_WIDGET_TOOLKIT))
INACTIVE_COMPONENT = 1
endif
include $(topsrcdir)/config/rules.mk
EXTRA_DSO_LDOPTS += -L$(DIST)/bin -L$(DIST)/lib -lgkgfx $(MOZ_COMPONENT_LIBS)