diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-07-22 15:51:31 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-07-22 15:51:31 +0000 |
| commit | 2e639c4b68604a6c6eb3dd073431645965a13335 (patch) | |
| tree | bd715904477bb29f2dcd2eddef093761b3b9637b /solenv/inc/tg_obj.mk | |
| parent | f3aed6d944849cca694b508cec2e13a0c45befd7 (diff) | |
INTEGRATION: CWS os2port03 (1.14.334); FILE MERGED
2008/07/16 12:20:06 obr 1.14.334.2: RESYNC: (1.14-1.15); FILE MERGED
2008/01/15 09:36:36 ydario 1.14.334.1: os2 build system makefile changes.
Issue number:i85203
Submitted by:ydario
Diffstat (limited to 'solenv/inc/tg_obj.mk')
| -rw-r--r-- | solenv/inc/tg_obj.mk | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/solenv/inc/tg_obj.mk b/solenv/inc/tg_obj.mk index 504cf24d7836..19933fa65e71 100644 --- a/solenv/inc/tg_obj.mk +++ b/solenv/inc/tg_obj.mk @@ -8,7 +8,7 @@ # # $RCSfile: tg_obj.mk,v $ # -# $Revision: 1.15 $ +# $Revision: 1.16 $ # # This file is part of OpenOffice.org. # @@ -35,6 +35,13 @@ MKFILENAME:=TG_OBJ.MK $(OBJTARGET): $(OBJFILES) $(IDLOBJFILES) @echo ------------------------------ @echo Making: $@ +.IF "$(GUI)"=="OS2" +.IF "$(LIBTARGET)"!="NO" + @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/) +.ENDIF # "$(LIBTARGET)"!="NO" + $(LIBMGR) $(LIBFLAGS) $@ $(&) +.ENDIF # "$(GUI)"=="OS2" + .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" $(ECHONL) $(foreach,i,$(OBJFILES:f) $(ROBJ)$/$(i)) > $@ @@ -61,6 +68,13 @@ $(OBJTARGET): $(OBJFILES) $(IDLOBJFILES) $($(SECOND_BUILD)OBJTARGET): $(REAL_$(SECOND_BUILD)_OBJFILES) @echo ------------------------------ @echo Making: $@ +.IF "$(GUI)"=="OS2" +.IF "$(LIBTARGET)"!="NO" + @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/) +.ENDIF # "$(LIBTARGET)"!="NO" + $(LIBMGR) $(LIBFLAGS) $@ $(&) +.ENDIF # "$(GUI)"=="OS2" + .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" # $(LIBMGR) $(LIBFLAGS) $@ $(OBJFILES) @@ -78,3 +92,9 @@ $($(SECOND_BUILD)OBJTARGET): $(REAL_$(SECOND_BUILD)_OBJFILES) .ENDIF # "$($(SECOND_BUILD)OBJTARGET)"!="" .ENDIF # "$(SECOND_BUILD)"!="" +.IF "$(GUI)"=="OS2" +.IF "$(LIBTARGET)"!="NO" + @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/) +.ENDIF # "$(LIBTARGET)"!="NO" + $(LIBMGR) $(LIBFLAGS) $@ $(&) +.ENDIF # "$(GUI)"=="OS2" |