Bugzilla bug #62855: added rule to build import libraries on OS/2. Thanks

to Javier Pedemonte <pedemont@us.ibm.com> for the patch.
Modified files: OS2.mk, rules.mk, ruleset.mk
This commit is contained in:
wtc%netscape.com 2001-02-02 01:17:58 +00:00
parent 5cfd69ff06
commit b080259a58
3 changed files with 10 additions and 1 deletions

View File

@ -70,6 +70,7 @@ AR = emxomfar -p256 r $@
AR_FLAGS = AR_FLAGS =
RANLIB = @echo OS2 RANLIB RANLIB = @echo OS2 RANLIB
BSDECHO = @echo OS2 BSDECHO BSDECHO = @echo OS2 BSDECHO
IMPLIB = emximp -o
FILTER = emxexp FILTER = emxexp
ifndef NO_SHARED_LIB ifndef NO_SHARED_LIB
@ -123,6 +124,7 @@ AR = -ilib /NOL /NOI /O:$(subst /,\\,$@)
AR_FLAGS = AR_FLAGS =
RANLIB = @echo OS2 RANLIB RANLIB = @echo OS2 RANLIB
BSDECHO = @echo OS2 BSDECHO BSDECHO = @echo OS2 BSDECHO
IMPLIB = implib /NOL /NOI
FILTER = cppfilt -b -p -q FILTER = cppfilt -b -p -q
ifndef NO_SHARED_LIB ifndef NO_SHARED_LIB

View File

@ -321,6 +321,13 @@ $(IMPORT_LIBRARY): $(SHARED_LIBRARY)
wlib +$(SHARED_LIBRARY) wlib +$(SHARED_LIBRARY)
endif endif
ifeq ($(OS_ARCH),OS2)
$(IMPORT_LIBRARY): $(OBJS)
rm -f $@
$(IMPLIB) $@ $(patsubst %.lib,%.dll.def,$@)
$(RANLIB) $@
endif
ifdef SHARED_LIBRARY_LIBS ifdef SHARED_LIBRARY_LIBS
SUB_SHLOBJS = $(foreach dir,$(SHARED_LIBRARY_DIRS),$(addprefix $(dir)/,$(shell $(MAKE) -C $(dir) --no-print-directory get_objs))) SUB_SHLOBJS = $(foreach dir,$(SHARED_LIBRARY_DIRS),$(addprefix $(dir)/,$(shell $(MAKE) -C $(dir) --no-print-directory get_objs)))
endif endif

View File

@ -175,7 +175,7 @@ ifdef PROGRAMS
endif endif
ifndef TARGETS ifndef TARGETS
ifeq ($(OS_ARCH), WINNT) ifeq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
TARGETS = $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(PROGRAM) TARGETS = $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(PROGRAM)
else else
TARGETS = $(LIBRARY) $(SHARED_LIBRARY) $(PROGRAM) TARGETS = $(LIBRARY) $(SHARED_LIBRARY) $(PROGRAM)