Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#40177

Browse Source 
r=cls, a=brendan
OS/2 build changes to get webshell/tests/viewer building


git-svn-id: svn://10.0.0.236/trunk@74460 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mkaply%us.ibm.com 2000-07-19 13:58:45 +00:00
parent ab359db843
commit 4141a1a3da
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/config/rules.mk
View File

@ -110,10 +110,8 @@ endif
ifeq ($(MOZ_OS2_TOOLS),VACPP)
EXTRA_DSO_LIBS := $(addsuffix .$(LIB_SUFFIX),$(addprefix $(DIST)/lib/,$(EXTRA_DSO_LIBS)))
EXTRA_DSO_LIBS := $(filter-out %/bin %/lib,$(EXTRA_DSO_LIBS))
VACPP_LDOPTS := $(filter -l%,$(EXTRA_DSO_LDOPTS))
VACPP_LDOPTS := $(subst -l,$(DIST)/lib/,$(VACPP_LDOPTS))
VACPP_LDOPTS := $(addsuffix .$(LIB_SUFFIX),$(VACPP_LDOPTS))
EXTRA_DSO_LDOPTS := $(VACPP_LDOPTS) $(filter-out -l%,$(EXTRA_DSO_LDOPTS))
EXTRA_DSO_LDOPTS := $(patsubst -l%,$(DIST)/lib/%.$(LIB_SUFFIX),$(EXTRA_DSO_LDOPTS))
LIBS := $(patsubst -l%,$(DIST)/lib/%.$(LIB_SUFFIX),$(LIBS))
else
EXTRA_DSO_LIBS := $(addprefix -l,$(EXTRA_DSO_LIBS))
endif
@ -482,7 +480,7 @@ endif
ifdef SHARED_LIBRARY
ifdef IS_COMPONENT
ifeq ($(OS_ARCH),OS2)
$(INSTALL) $(IFLAGS2) $(IMPORT_LIBRARY) $(DIST)/lib
$(INSTALL) $(IFLAGS2) $(IMPORT_LIBRARY) $(DIST)/lib/components
else
$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DIST)/lib/components
$(ELF_DYNSTR_GC) $(DIST)/lib/components/$(SHARED_LIBRARY)

12
mozilla/webshell/tests/viewer/Makefile.in
View File

@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk
DIRS := public
PROGRAM := viewer
PROGRAM := viewer$(BIN_SUFFIX)
CPPSRCS = \
$(TOOLKIT_CPPSRCS) \
@ -84,6 +84,9 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
BEOS_PROGRAM_RESOURCE = $(srcdir)/viewer-beos.rsrc
TOOLKIT_CPPSRCS = nsBeOSMain.cpp
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
TOOLKIT_CPPSRCS = nsOS2Main.cpp
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),photon)
TOOLKIT_CPPSRCS = nsPhMain.cpp nsPhMenu.cpp
endif
@ -134,10 +137,15 @@ 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 -lgtksuperwin $(XP_LIBS) $(MOZ_GTK_LDFLAGS)
ifeq ($(MOZ_OS2_TOOLS),VACPP)
XP_DIST_DEP_LIBS := $(patsubst -l%,$(DIST)/lib/%.lib,$(XP_DIST_LIBS))
else
XP_DIST_DEP_LIBS := $(filter-out -L$(DIST)/bin -L$(DIST)/lib, $(XP_DIST_LIBS))
XP_DIST_DEP_LIBS := $(addprefix $(DIST)/,$(patsubst -l%,bin/lib%$(DLL_SUFFIX),$(XP_DIST_DEP_LIBS:-l%_s=lib/lib%_s.a)))
endif
EXTRA_DEPS = \
$(addprefix $(DIST)/,$(patsubst -l%,bin/lib%$(DLL_SUFFIX),$(XP_DIST_DEP_LIBS:-l%_s=lib/lib%_s.a))) \
$(XP_DIST_DEP_LIBS) \
$(UNIX_VIEWER_TK_LIBS) \
$(XP_NS_UNDERBAR_CRAP) \
$(NULL)