Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-28 11:28:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added $(FE_X_LIBS) to INCLUDES and $(FE_X_LIBS) to DSO_OS_LDOPTS to take care of motif dependencies under solaris.

Browse Source
This commit is contained in:
cls%seawood.org 1998-10-28 06:22:16 +00:00
parent 0e721ffef3
commit 5de96f891e
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
webshell/tests/viewer/Makefile.in
View File

@ -39,6 +39,8 @@ CPPSRCS = \
INCLUDES+= -I$(PUBLIC)/raptor -I$(PUBLIC)/xpcom -I$(PUBLIC)/dom \
-I$(PUBLIC)/netlib -I$(PUBLIC)/js -I$(PUBLIC)/pref -I$(PUBLIC)/network -I$(PUBLIC)/xp
INCLUDES += $(FE_X_CFLAGS)
OBJS = $(CPPSRCS:.cpp=.o)
EX_LIBS = \
@ -115,12 +117,12 @@ include $(topsrcdir)/config/rules.mk
$(PROGS): $(OBJS) $(EX_LIBS)
@$(MAKE_OBJDIR)
ifeq ($(OS_ARCH),Linux)
$(CCC) -rdynamic -o $@ $(OBJS) $(LDFLAGS) $(EX_LIBS) $(NSPR_LIBS) $(FE_X_LIBS) $(OS_LIBS)
$(CCC) -rdynamic -o $@ $(OBJS) $(LDFLAGS) $(EX_LIBS) $(NSPR_LIBS) $(FE_X_LIBS) $(XLDFLAGS) $(XLIBS) $(OS_LIBS)
else
ifeq ($(OS_ARCH),IRIX)
$(CCC) -o $@ -woff 84,85 $(LDFLAGS) $(OBJS) $(EX_LIBS) $(NSPR_LIBS) $(FE_X_LIBS) $(OS_LIBS)
$(CCC) -o $@ -woff 84,85 $(LDFLAGS) $(OBJS) $(EX_LIBS) $(NSPR_LIBS) $(FE_X_LIBS) $(XLDFLAGS) $(XLIBS) $(OS_LIBS)
else
$(CCC) -o $@ $(LDFLAGS) $(OBJS) $(EX_LIBS) $(NSPR_LIBS) $(FE_X_LIBS) $(OS_LIBS)
$(CCC) -o $@ $(LDFLAGS) $(OBJS) $(EX_LIBS) $(NSPR_LIBS) $(FE_X_LIBS) $(XLDFLAGS) $(XLIBS) $(OS_LIBS)
endif
endif

10
widget/src/build/Makefile.in
View File

@ -32,6 +32,8 @@ REQUIRES=util img xpcom raptor netlib
INCLUDES+= -I$(srcdir)/../xpwidgets -I$(srcdir)/../motif -I$(srcdir)/.
INCLUDES += $(FE_X_CFLAGS)
CPPSRCS=dlldeps.cpp nsWidgetSupport.cpp nsMotifWidgetFactory.cpp
ifeq ($(OS_ARCH),IRIX)
@ -48,13 +50,7 @@ EXTRA_DSO_LDOPTS+=\
$(DIST)/bin/libreg.so \
$(NSPR_LIBS)
# This should really be done properly in 'config'
ifeq ($(OS_ARCH),Linux)
EXTRA_DSO_LDOPTS+=\
-L/usr/X11R6/lib -lX11 -lm
else
EXTRA_DSO_LDOPTS+= -lXm -lXt -lX11 -lm
endif
EXTRA_DSO_LDOPTS += $(FE_X_LIBS) $(XLDFLAGS) $(XLIBS)
include $(topsrcdir)/config/rules.mk

2
widget/src/motif/Makefile.in
View File

@ -35,6 +35,8 @@ DEFINES += -D_IMPL_NS_WIDGET
INCLUDES+= -I$(srcdir)/../xpwidgets -I$(srcdir)/../motif -I$(srcdir)/.
INCLUDES += $(FE_X_CFLAGS)
CPPSRCS= \
nsMenuBar.cpp \
nsMenu.cpp \

1
widget/src/xpwidgets/Makefile.in
View File

@ -35,6 +35,7 @@ else
INCLUDES += -I$(srcdir)/../public -I$(PUBLIC)/xpcom -I$(PUBLIC)/raptor -I$(srcdir)/../motif -I$(srcdir)/.
endif
INCLUDES += $(FE_X_CFLAGS)
CPPSRCS=nsBaseWidget.cpp \
nsMenuButton.cpp \