r=cls
Enable OBJDIR builds for OS/2
This commit is contained in:
mkaply%us.ibm.com 2001-01-27 15:36:41 +00:00
Родитель e16ea26d40
Коммит 32b73e9541
6 изменённых файлов: 23 добавлений и 22 удалений

Просмотреть файл

@ -132,7 +132,7 @@ foreach $ac_file (@makefiles) {
$top_srcdir = $ac_dots;
$top_srcdir =~ s%/$%%;
}
} elsif ($ac_given_srcdir =~ m%^/%) {
} elsif ($ac_given_srcdir =~ m%^/% or $ac_given_srcdir =~ m%^.:/%) {
$srcdir = "$ac_given_srcdir$ac_dir_suffix";
$top_srcdir = "$ac_given_srcdir";
} else {

Просмотреть файл

@ -208,7 +208,7 @@ sub update_makefiles {
$top_srcdir = $ac_dots;
$top_srcdir =~ s%/$%%;
}
} elsif ($ac_given_srcdir =~ m%^/%) {
} elsif ($ac_given_srcdir =~ m%^/% or $ac_given_srcdir =~ m%^.:/%) {
$srcdir = "$ac_given_srcdir$ac_dir_suffix";
$top_srcdir = "$ac_given_srcdir";
} else {
@ -246,14 +246,14 @@ sub update_makefiles {
};
while (<INFILE>) {
if (/\@[_a-zA-Z]*\@.*\@[_a-zA-Z]*\@/) {
#warn "Two defines on a line:$ac_file:$.:$_";
push @unhandled, $ac_file;
last;
}
#if (/\@[_a-zA-Z]*\@.*\@[_a-zA-Z]*\@/) {
# #warn "Two defines on a line:$ac_file:$.:$_";
# push @unhandled, $ac_file;
# last;
#}
s/\@srcdir\@/$srcdir/;
s/\@top_srcdir\@/$top_srcdir/;
s/\@srcdir\@/$srcdir/g;
s/\@top_srcdir\@/$top_srcdir/g;
if (/\@[_a-zA-Z]*\@/) {
#warn "Unknown variable:$ac_file:$.:$_";

Просмотреть файл

@ -78,8 +78,14 @@ ROOTDIR := $(CWD)
TOPSRCDIR := $(CWD)/mozilla
endif
ifeq "$(ROOTDIR)" "/"
ROOTDIR := /.
# on os2, TOPSRCDIR may have two forward slashes in a row, which doesn't
# work; replace first instance with one forward slash
TOPSRCDIR := $(shell echo $(TOPSRCDIR) | sed s%//%/%)
# if ROOTDIR equals only drive letter (i.e. "C:"), set to "/"
DIRNAME := $(shell echo $(ROOTDIR) | sed s/^.://)
ifeq ($(DIRNAME),)
ROOTDIR := /.
endif
AUTOCONF := autoconf
@ -109,6 +115,7 @@ endif
CVSCO = $(strip cvs $(CVS_FLAGS) co $(CVS_CO_FLAGS))
CVSCO_LOGFILE := $(ROOTDIR)/cvsco.log
CVSCO_LOGFILE := $(shell echo $(CVSCO_LOGFILE) | sed s%//%/%)
ifdef MOZ_CO_TAG
CVS_CO_FLAGS := -r $(MOZ_CO_TAG)

Просмотреть файл

@ -606,8 +606,8 @@ endif
endif # BeOS
ifeq ($(OS_ARCH),OS2)
ifdef OS2_PROGRAM_RESOURCE
rc -n -x2 -r $(OS2_PROGRAM_RESOURCE)
rc -n -x2 $(patsubst %.rc,%.res,$(OS2_PROGRAM_RESOURCE)) $@
rc -n -x2 -i $(subst /,\,$(srcdir)) -r $(subst /,\,$(OS2_PROGRAM_RESOURCE)) $(patsubst %.rc, %.res, $(notdir $(OS2_PROGRAM_RESOURCE)))
rc -n -x2 -i $(subst /,\,$(srcdir)) $(patsubst %.rc, %.res, $(notdir $(OS2_PROGRAM_RESOURCE))) $@
endif # os2_prog_rsrc
endif

Просмотреть файл

@ -4347,11 +4347,9 @@ dnl Where the NSPR stuff gets installed: $DIST/{bin,lib,include}
dnl
MOZ_NSPRENV_DIST=`pwd`/dist
case "$target" in
*-*-os2_emx)
MOZ_NSPRENV_DIST=`pwd -D`'/dist'
;;
*-*-os2_vacpp)
MOZ_NSPRENV_DIST="$ROOT"`pwd -D`'/dist'
*-*-os2*)
MOZ_NSPRENV_DIST=`pwd -D | sed s/^.://`
MOZ_NSPRENV_DIST="$ROOT""$MOZ_NSPRENV_DIST/dist"
;;
esac

Просмотреть файл

@ -41,11 +41,7 @@ else
OSDIR = unix
endif
ifeq ($(MOZ_OS2_TOOLS),VACPP)
OSHELPER = $(OSDIR)/nsOSHelperAppService.cpp
else
OSHELPER = nsOSHelperAppService.cpp
endif
EXPORTS = nsExternalHelperAppService.h \
$(OSDIR)/nsOSHelperAppService.h \