mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 11:25:00 +00:00
Sync'd with Makefiles
This commit is contained in:
cls%seawood.org
parent
e4de69dfd7
commit
3b35de8e5e
@ -39,8 +39,9 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
# XmL headers are exported to dist/public/Microline/XmL
|
||||
# XmL headers are exported to dist/include/XmL
|
||||
MODULE = Microline/XmL
|
||||
INCL_SUBDIR = /XmL
|
||||
|
||||
LIBRARY_NAME = XmL
|
||||
|
||||
|
||||
@ -31,8 +31,9 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
# XfeWidgets headers are exported to dist/public/XfeWidgets/Xfe
|
||||
# XfeWidgets headers are exported to dist/include/Xfe
|
||||
MODULE = XfeWidgets/Xfe
|
||||
INCL_SUBDIR = /Xfe
|
||||
|
||||
LIBRARY_NAME = XfeWidgets
|
||||
|
||||
|
||||
@ -31,8 +31,9 @@ srcdir = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
# XfeWidgets headers are exported to dist/public/XfeWidgets/Xfe
|
||||
# XfeWidgets headers are exported to dist/include/Xfe
|
||||
MODULE = XfeWidgets/Xfe
|
||||
INCL_SUBDIR = /Xfe
|
||||
|
||||
LIBRARY_NAME = XfeBm
|
||||
|
||||
|
||||
@ -32,10 +32,9 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
# XfeWidgets headers are exported to dist/public/XfeCaption/Xfe. We use
|
||||
# the 'Xfe' directory to avoid the hasstle of having to remember yet another
|
||||
# include prefix.
|
||||
# XfeWidgets headers are exported to dist/include/Xfe
|
||||
MODULE = XfeCaption/Xfe
|
||||
INCL_SUBDIR = /Xfe
|
||||
|
||||
LIBRARY_NAME = XfeCaption
|
||||
|
||||
|
||||
@ -32,10 +32,9 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
# XfeWidgets headers are exported to dist/public/XfeComboBox/Xfe. We use
|
||||
# the 'Xfe' directory to avoid the hasstle of having to remember yet another
|
||||
# include prefix.
|
||||
# XfeWidgets headers are exported to dist/include/Xfe.
|
||||
MODULE = XfeComboBox/Xfe
|
||||
INCL_SUBDIR = /Xfe
|
||||
|
||||
LIBRARY_NAME = XfeComboBox
|
||||
|
||||
|
||||
@ -31,10 +31,9 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
# XfeWidgets headers are exported to dist/public/XfePref/Xfe. We use
|
||||
# the 'Xfe' directory to avoid the hasstle of having to remember yet another
|
||||
# include prefix.
|
||||
# XfeWidgets headers are exported to dist/include/Xfe.
|
||||
MODULE = XfePref/Xfe
|
||||
INCL_SUBDIR = /Xfe
|
||||
|
||||
LIBRARY_NAME = XfePref
|
||||
|
||||
|
||||
@ -31,8 +31,9 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
# XfeTest headers (only one) are exported to dist/public/XfeTest/Xfe
|
||||
# XfeTest headers (only one) are exported to dist/include/Xfe
|
||||
MODULE = XfeTest/Xfe
|
||||
INCL_SUBDIR = /Xfe
|
||||
|
||||
LIBRARY_NAME = XfeTest
|
||||
|
||||
|
||||
@ -32,10 +32,9 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
# XfeWidgets headers are exported to dist/public/XfeToolBar/Xfe. We use
|
||||
# the 'Xfe' directory to avoid the hassle of having to remember yet another
|
||||
# include prefix.
|
||||
# XfeWidgets headers are exported to dist/include/Xfe.
|
||||
MODULE = XfeToolBar/Xfe
|
||||
INCL_SUBDIR = /Xfe
|
||||
|
||||
LIBRARY_NAME = XfeToolBar
|
||||
|
||||
|
||||
@ -32,10 +32,9 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
# XfeWidgets headers are exported to dist/public/XfeToolTip/Xfe. We use
|
||||
# the 'Xfe' directory to avoid the hasstle of having to remember yet another
|
||||
# include prefix.
|
||||
# XfeWidgets headers are exported to dist/include/Xfe.
|
||||
MODULE = XfeToolTip/Xfe
|
||||
INCL_SUBDIR = /Xfe
|
||||
|
||||
LIBRARY_NAME = XfeToolTip
|
||||
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
#! gmake
|
||||
#
|
||||
# The contents of this file are subject to the Netscape Public License
|
||||
# Version 1.0 (the "NPL"); you may not use this file except in
|
||||
@ -28,51 +27,30 @@ include $(topsrcdir)/cmd/unixfe/config/unixfe.mk
|
||||
MODULE = xfeicons
|
||||
LIBRARY_NAME = xfeicons
|
||||
|
||||
CSRCS = $(ICONS_GEN_SRC)
|
||||
EXPORTS = $(ICONS_GEN_HDR) $(srcdir)/icondata.h
|
||||
EXPORTS = $(srcdir)/icondata.h
|
||||
|
||||
REQUIRES = img java jtools layer util xp xpcom
|
||||
|
||||
REQUIRES += \
|
||||
$(XFE_JPEG_REQUIRES) \
|
||||
$(XFE_PNG_REQUIRES) \
|
||||
$(XFE_ZLIB_REQUIRES)
|
||||
REQUIRES = img java jtools layer nspr util xp xpcom \
|
||||
$(XFE_JPEG_REQUIRES) $(XFE_PNG_REQUIRES) $(XFE_ZLIB_REQUIRES)
|
||||
|
||||
LOCAL_INCLUDES = -I$(srcdir)/. -I$(OBJDIR)
|
||||
|
||||
ICONS_GEN_HDR = $(OBJDIR)/icon_extern.h
|
||||
ICONS_GEN_SRC = $(OBJDIR)/icondata.c
|
||||
ICONLIST = $(OBJDIR)/icon.list
|
||||
ICONANIMLIST = $(OBJDIR)/iconanim.list
|
||||
MKICONS_EXE = $(OBJDIR)/mkicons
|
||||
|
||||
ICONLIST = $(OBJDIR)/icon.list
|
||||
ICONANIMLIST = $(OBJDIR)/iconanim.list
|
||||
MKICONS_EXE = $(OBJDIR)/mkicons
|
||||
|
||||
GARBAGE += $(MKICONS_EXE) \
|
||||
$(ICONS_GEN_HDR) \
|
||||
$(ICONS_GEN_HDR).tmp \
|
||||
$(ICONS_GEN_SRC) \
|
||||
$(ICONLIST) \
|
||||
$(ICONANIMLIST)
|
||||
|
||||
$(ICONS_GEN_HDR) \
|
||||
$(ICONS_GEN_HDR).tmp \
|
||||
$(ICONS_GEN_SRC) \
|
||||
$(ICONLIST) \
|
||||
$(ICONANIMLIST)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
#### NEXT FEW LINES ARE ONLY FOR TESTING -- full build!
|
||||
#MOZ_MAIL_NEWS = 1
|
||||
#MOZ_EDITOR = 1
|
||||
#MOZ_OFFLINE = 1
|
||||
#MOZ_LOC_INDEP = 1
|
||||
#MOZ_TASKBAR = 1
|
||||
#MOZ_LDAP = 1
|
||||
#MOZ_ADMIN_LIB = 1
|
||||
#MOZ_COMMUNICATOR_NAME = 1
|
||||
#MOZ_JSD = 1
|
||||
#MOZ_IFC_TOOLS = 1
|
||||
#MOZ_NETCAST = 1
|
||||
#MOZ_COMMUNICATOR_IIDS = 1
|
||||
#MOZ_COMMUNICATOR_ABOUT = 1
|
||||
#MOZ_COMMUNICATOR_CONFIG_JS = 1
|
||||
#MOZ_COPY_ALL_JARS = 1
|
||||
#### END OF TESTING LINES
|
||||
OBJS = $(ICONS_GEN_SRC:.c=.o)
|
||||
|
||||
# See comment in icondata.c for why this is necessary.
|
||||
DEFINES += -DXFE
|
||||
@ -80,71 +58,67 @@ DEFINES += -DXFE
|
||||
# Split the icons by portion of the product.
|
||||
# Be careful to avoid hitting max line length on Irix,
|
||||
# therefore, split the icon list among several variables.
|
||||
ICONS = $(wildcard $(srcdir)/images/[AGIHL]*.gif $(srcdir)/images/BM*.gif $(srcdir)/images/DTB*.gif)
|
||||
ICONS += $(wildcard $(srcdir)/images/Dash*.gif $(srcdir)/images/TB*.gif)
|
||||
ICONS += $(addprefix $(srcdir)/, \
|
||||
images/Desk_AdminKit.gif \
|
||||
images/Desk_Bookmark.gif \
|
||||
images/Desk_Calendar.gif \
|
||||
images/Desk_Communicator.gif \
|
||||
images/Desk_Conference.gif \
|
||||
images/Desk_History.gif \
|
||||
images/Desk_Navigator.gif \
|
||||
images/Desk_Search.gif \
|
||||
images/SEC_Replace.gif \
|
||||
images/Splash.gif \
|
||||
images/cparent.gif )
|
||||
ICONS = $(wildcard $(srcdir)/images/[AGIHL]*.gif $(srcdir)/images/BM*.gif $(srcdir)/images/DTB*.gif)
|
||||
ICONS += $(wildcard $(srcdir)/images/Dash*.gif $(srcdir)/images/TB*.gif)
|
||||
ICONS += $(addprefix $(srcdir)/, \
|
||||
images/Desk_AdminKit.gif \
|
||||
images/Desk_Bookmark.gif \
|
||||
images/Desk_Calendar.gif \
|
||||
images/Desk_Communicator.gif \
|
||||
images/Desk_Conference.gif \
|
||||
images/Desk_History.gif \
|
||||
images/Desk_Navigator.gif \
|
||||
images/Desk_Search.gif \
|
||||
images/SEC_Replace.gif \
|
||||
images/Splash.gif \
|
||||
images/cparent.gif )
|
||||
|
||||
# Icons for the Outliner
|
||||
ICONS += $(wildcard $(srcdir)/images/hidecolumn*.gif $(srcdir)/images/showcolumn*.gif) \
|
||||
$(srcdir)/images/oparent.gif
|
||||
ICONS += $(wildcard $(srcdir)/images/hidecolumn*.gif $(srcdir)/images/showcolumn*.gif) \
|
||||
$(srcdir)/images/oparent.gif
|
||||
|
||||
# Icons referenced in rosetta.h
|
||||
ICONS += $(wildcard $(srcdir)/images/M_*.gif)
|
||||
ICONS += $(wildcard $(srcdir)/images/M_*.gif)
|
||||
|
||||
MAIL_OR_COMPOSE_ICONS = $(wildcard $(srcdir)/images/MNC*.gif \
|
||||
$(srcdir)/images/MNTB_Next*.gif \
|
||||
$(srcdir)/images/MNTB_Forward*.gif \
|
||||
$(srcdir)/images/MNAB_NewPerson*.gif \
|
||||
$(srcdir)/images/MN_Draft*.gif \
|
||||
$(srcdir)/images/MN_Collect*.gif \
|
||||
$(srcdir)/images/MN_Template*.gif ) \
|
||||
$(addprefix $(srcdir)/, \
|
||||
images/MN_MailAttach.gif \
|
||||
images/MN_Person.gif \
|
||||
images/MN_People.gif )
|
||||
MAIL_OR_COMPOSE_ICONS = $(wildcard $(srcdir)/images/MNC*.gif $(srcdir)/images/MNTB_Next*.gif \
|
||||
$(srcdir)/images/MNTB_Forward*.gif $(srcdir)/images/MNAB_NewPerson*.gif \
|
||||
$(srcdir)/images/MN_Draft*.gif $(srcdir)/images/MN_Collect*.gif \
|
||||
$(srcdir)/images/MN_Template*.gif) \
|
||||
$(addprefix $(srcdir)/, \
|
||||
images/MN_MailAttach.gif \
|
||||
images/MN_Person.gif \
|
||||
images/MN_People.gif )
|
||||
|
||||
ifdef MOZ_MAIL_NEWS
|
||||
ICONS += $(MAIL_OR_COMPOSE_ICONS) \
|
||||
$(wildcard $(srcdir)/images/MNTB*.gif $(srcdir)/images/MNAB*.gif) \
|
||||
$(addprefix $(srcdir)/,
|
||||
images/threadoff.gif \
|
||||
images/threadon.gif \
|
||||
images/Desk_Address.gif \
|
||||
images/Desk_Collabra.gif \
|
||||
images/Desk_Messenger.gif \
|
||||
images/Desk_MsgCenter.gif \
|
||||
images/Desk_NewMail.gif )
|
||||
ICONS += $(MAIL_OR_COMPOSE_ICONS) \
|
||||
$(wildcard $(srcdir)/images/MNTB*.gif $(srcdir)/images/MNAB*.gif $(srcdir)/images/MN_*.gif) \
|
||||
$(addprefix $(srcdir)/, \
|
||||
images/threadoff.gif \
|
||||
images/threadon.gif \
|
||||
images/Desk_Address.gif \
|
||||
images/Desk_Collabra.gif \
|
||||
images/Desk_Messenger.gif \
|
||||
images/Desk_MsgCenter.gif \
|
||||
images/Desk_NewMail.gif )
|
||||
endif
|
||||
|
||||
ifdef MOZ_MAIL_COMPOSE
|
||||
ifndef MOZ_MAIL_NEWS
|
||||
ICONS += $(MAIL_OR_COMPOSE_ICONS)
|
||||
ICONS += $(MAIL_OR_COMPOSE_ICONS)
|
||||
endif
|
||||
ICONS += \
|
||||
$(srcdir)/images/Desk_MsgCompose.gif
|
||||
ICONS += $(srcdir)/images/Desk_MsgCompose.gif
|
||||
endif
|
||||
|
||||
ifdef MOZ_EDITOR
|
||||
ICONS += $(wildcard $(srcdir)/images/e*.gif $(srcdir)/images/Desk_Composer.gif)
|
||||
ICONS += $(wildcard $(srcdir)/images/e*.gif $(srcdir)/images/Desk_Composer.gif)
|
||||
endif
|
||||
|
||||
ifdef MOZ_TASKBAR
|
||||
ICONS += $(wildcard $(srcdir)/images/Task*.gif)
|
||||
ICONS += $(wildcard $(srcdir)/images/Task*.gif)
|
||||
endif
|
||||
|
||||
ifdef MOZ_NETCAST
|
||||
ICONS += $(srcdir)/images/Desk_Netcaster.gif
|
||||
ICONS += $(srcdir)/images/Desk_Netcaster.gif
|
||||
endif
|
||||
|
||||
ifdef NETSCAPE_COMMERCIAL
|
||||
@ -154,29 +128,35 @@ ANIM = $(wildcard $(srcdir)/anim/main/*.gif)
|
||||
endif
|
||||
|
||||
ifdef JAVA_OR_NSJVM
|
||||
JAVA_JMC = $(DIST)/lib/libjmc.a # XXX To be removed...
|
||||
JAVA_JMC = $(DIST)/lib/libjmc.a # XXX To be removed...
|
||||
else
|
||||
JAVA_JMC = $(DIST)/lib/libstubsj.a
|
||||
JAVA_JMC = $(DIST)/lib/libstubsj.a
|
||||
endif
|
||||
|
||||
MKICONS_LIB = \
|
||||
$(DIST)/lib/libimg.a \
|
||||
$(JAVA_JMC) \
|
||||
$(DIST)/lib/libutil.a \
|
||||
$(DIST)/lib/libxp.a \
|
||||
$(DIST)/lib/libxpcom.a \
|
||||
$(XFE_MKICONS_PNG_LIB) \
|
||||
$(XFE_MKICONS_ZLIB_LIB) \
|
||||
$(XFE_MKICONS_JPEG_LIB) \
|
||||
$(NULL)
|
||||
$(DIST)/lib/libimg.a \
|
||||
$(JAVA_JMC) \
|
||||
$(DIST)/lib/libutil.a \
|
||||
$(DIST)/lib/libxp.a \
|
||||
$(DIST)/lib/libxpcom.a \
|
||||
$(XFE_MKICONS_PNG_LIB) \
|
||||
$(XFE_MKICONS_ZLIB_LIB) \
|
||||
$(XFE_MKICONS_JPEG_LIB) \
|
||||
$(NULL)
|
||||
|
||||
MKICONS_DSOS = \
|
||||
$(XFE_MKICONS_JPEG_DSO) \
|
||||
$(XFE_MKICONS_PNG_DSO) \
|
||||
$(XFE_MKICONS_ZLIB_DSO) \
|
||||
$(NULL)
|
||||
MKICONS_DSOS = \
|
||||
$(XFE_MKICONS_JPEG_DSO) \
|
||||
$(XFE_MKICONS_PNG_DSO) \
|
||||
$(XFE_MKICONS_ZLIB_DSO) \
|
||||
$(NULL)
|
||||
|
||||
MKICONS_EXTRA = $(NSPR_LIBS) $(MKICONS_DSOS) $(OS_LIBS) -lm
|
||||
GARBAGE += $(MKICONS_EXE) \
|
||||
$(wildcard $(ICONS_GEN_HDR)*) \
|
||||
$(wildcard $(ICONS_GEN_SRC)*) \
|
||||
$(ICONLIST) \
|
||||
$(ICONANIMLIST)
|
||||
|
||||
MKICONS_EXTRA = $(MKICONS_DSOS) $(NSPR_LIBS) $(OS_LIBS) -lm
|
||||
|
||||
#######################################################################
|
||||
# Rules to build mkicons program and then icondata.c
|
||||
@ -201,14 +181,17 @@ ifneq ($(ANIM),)
|
||||
endif
|
||||
|
||||
$(ICONS_GEN_HDR): $(ICONLIST)
|
||||
@sed 's/.*\/images\/\(.*\)\.gif.*/extern struct fe_icon_data \1;/; y/./_/;' \
|
||||
$(ICONLIST) > $@.$$$$ \
|
||||
&& if [ ! -f $(ICONS_GEN_HDR) -o "`cmp $@.$$$$ $@`" != "" ] ; then \
|
||||
echo Generating $@ from $(ICONLIST); \
|
||||
\mv -f $@.$$$$ $@; \
|
||||
fi
|
||||
@rm -f $@.tmp
|
||||
@sed 's/.*\/images\/\(.*\)\.gif.*/extern struct fe_icon_data \1;/; y/./_/;' $(ICONLIST) > $@.tmp
|
||||
@if test ! -f $@; then touch $@; else true; fi
|
||||
@if test ! -z "`diff $@.tmp $@`"; then rm -f $@; mv $@.tmp $@; else true; fi
|
||||
|
||||
$(ICONS_GEN_SRC): icondata.h $(ICONANIMLIST) $(MKICONS_EXE) $(ICONS_GEN_HDR)
|
||||
$(MKICONS_EXE) -no-xfe-define - < $(ICONANIMLIST) > $@.$$$$ && mv $@.$$$$ $@
|
||||
@rm -f $@
|
||||
$(MKICONS_EXE) -no-xfe-define - < $(ICONANIMLIST) > $@
|
||||
|
||||
$(LIBRARY): $(OBJS)
|
||||
|
||||
export:: $(ICONS_GEN_HDR) $(DIST)/include
|
||||
$(INSTALL) -m 444 $^
|
||||
|
||||
|
||||
@ -69,8 +69,7 @@ REQUIRES =\
|
||||
caps
|
||||
|
||||
ifdef OJI
|
||||
REQUIRES += oji \
|
||||
ojiimpl
|
||||
REQUIRES += oji ojiimpl
|
||||
endif
|
||||
|
||||
ifdef MOZ_MAIL_NEWS
|
||||
@ -330,7 +329,7 @@ INCLUDES += -I$(OBJDIR) -I$(srcdir)/.. -I$(srcdir)/../DtWidgets -I$(topsrcdir)/m
|
||||
-I$(DEPTH)/dist/public/security
|
||||
|
||||
ifdef MOZ_MAIL_NEWS
|
||||
INCLUDES += -I$(topsrcdir)/lib/libmsg -I$(DEPTH)/dist/public/ldap
|
||||
INCLUDES += -I$(topsrcdir)/lib/libmsg
|
||||
endif
|
||||
|
||||
DEFINES += -DNEW_DECODERS -DDELAYED_MENU_CREATION -DNETCASTER_ZAXIS_HACKERY
|
||||
|
||||
Loading…
Reference in New Issue
Block a user