tg_shl.mk (7871dc3e) tg_shl.mk (534c536d)
1#**************************************************************
2#
3# Licensed to the Apache Software Foundation (ASF) under one
4# or more contributor license agreements. See the NOTICE file
5# distributed with this work for additional information
6# regarding copyright ownership. The ASF licenses this file
7# to you under the Apache License, Version 2.0 (the
8# "License"); you may not use this file except in compliance

--- 252 unchanged lines hidden (view full) ---

261
262$(MISC)/%linkinc.ls:
263 @echo . > $@
264.ENDIF # "$(linkinc)"!=""
265
266.IF "$(GUI)" == "OS2"
267#21/02/2006 YD dll names must be 8.3, invoke fix script
268#check osl/os2/module.c/osl_loadModule()
1#**************************************************************
2#
3# Licensed to the Apache Software Foundation (ASF) under one
4# or more contributor license agreements. See the NOTICE file
5# distributed with this work for additional information
6# regarding copyright ownership. The ASF licenses this file
7# to you under the Apache License, Version 2.0 (the
8# "License"); you may not use this file except in compliance

--- 252 unchanged lines hidden (view full) ---

261
262$(MISC)/%linkinc.ls:
263 @echo . > $@
264.ENDIF # "$(linkinc)"!=""
265
266.IF "$(GUI)" == "OS2"
267#21/02/2006 YD dll names must be 8.3, invoke fix script
268#check osl/os2/module.c/osl_loadModule()
269SHL$(TNR)TARGET8=$(shell @fix_shl $(SHL$(TNR)TARGET))
269SHL$(TNR)TARGET8=$(shell @fix_shl.cmd $(SHL$(TNR)TARGET))
270.ENDIF
271
272.IF "$(GUI)" == "OS2"
273_SHL$(TNR)IMP_ORD = $(SHL$(TNR)STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL$(TNR)STDLIBS:^"$(LB)/")
274SHL$(TNR)IMP_ORD = $(foreach,i,$(_SHL$(TNR)IMP_ORD) $(shell @-ls $i))
275.ELSE
276SHL$(TNR)IMP_ORD =
277.ENDIF

--- 225 unchanged lines hidden (view full) ---

503.IF "$(VERBOSE)" == "TRUE"
504 @ls -l $@
505.ENDIF
506.ENDIF # "$(GUI)" == "UNX"
507
508.IF "$(GUI)" == "OS2"
509
510.IF "$(SHL$(TNR)DEFAULTRES)"!=""
270.ENDIF
271
272.IF "$(GUI)" == "OS2"
273_SHL$(TNR)IMP_ORD = $(SHL$(TNR)STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL$(TNR)STDLIBS:^"$(LB)/")
274SHL$(TNR)IMP_ORD = $(foreach,i,$(_SHL$(TNR)IMP_ORD) $(shell @-ls $i))
275.ELSE
276SHL$(TNR)IMP_ORD =
277.ENDIF

--- 225 unchanged lines hidden (view full) ---

503.IF "$(VERBOSE)" == "TRUE"
504 @ls -l $@
505.ENDIF
506.ENDIF # "$(GUI)" == "UNX"
507
508.IF "$(GUI)" == "OS2"
509
510.IF "$(SHL$(TNR)DEFAULTRES)"!=""
511 @+-$(RM) $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc >& $(NULLDEV)
511 @+-$(RM) $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc > $(NULLDEV)
512.IF "$(SHL$(TNR)ICON)" != ""
513 @-+echo 1 ICON $(SHL$(TNR)ICON) >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
514.ENDIF
515.IF "$(use_shl_versions)" != ""
516.IF "$(SHL$(TNR)ADD_VERINFO)"!=""
517 @-+echo $(EMQ)#include $(EMQ)"$(SHL$(TNR)ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
518.ENDIF # "$(SHL$(TNR)ADD_VERINFO)"!=""
519 @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc

--- 11 unchanged lines hidden (view full) ---

531
532 $(COMMAND_ECHO)$(SHL$(TNR)LINKER) $(SHL$(TNR)LINKFLAGS) $(LINKFLAGSSHL) -o $@ \
533 $(SHL$(TNR)DEF) \
534 $(STDOBJ) \
535 -L$(LB) \
536 -L$(SOLARVERSION)/$(INPATH)/lib \
537 $(SHL$(TNR)OBJS) $(SHL$(TNR)VERSIONOBJ) \
538 $(SHL$(TNR)LIBS) \
512.IF "$(SHL$(TNR)ICON)" != ""
513 @-+echo 1 ICON $(SHL$(TNR)ICON) >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
514.ENDIF
515.IF "$(use_shl_versions)" != ""
516.IF "$(SHL$(TNR)ADD_VERINFO)"!=""
517 @-+echo $(EMQ)#include $(EMQ)"$(SHL$(TNR)ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
518.ENDIF # "$(SHL$(TNR)ADD_VERINFO)"!=""
519 @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc

--- 11 unchanged lines hidden (view full) ---

531
532 $(COMMAND_ECHO)$(SHL$(TNR)LINKER) $(SHL$(TNR)LINKFLAGS) $(LINKFLAGSSHL) -o $@ \
533 $(SHL$(TNR)DEF) \
534 $(STDOBJ) \
535 -L$(LB) \
536 -L$(SOLARVERSION)/$(INPATH)/lib \
537 $(SHL$(TNR)OBJS) $(SHL$(TNR)VERSIONOBJ) \
538 $(SHL$(TNR)LIBS) \
539 $(SHL$(TNR)STDLIBS:^"-l") \
540 $(SHL$(TNR)LINKRES) \
539 $(SHL$(TNR)LINKRES) \
541 $(SHL$(TNR)STDSHL:^"-l") $(STDSHL$(TNR):^"-l")
540 $(SHL$(TNR)STDLIBS) \
541 $(SHL$(TNR)STDSHL) $(STDSHL$(TNR))
542
543.ELSE # "$(USE_DEFFILE)"!=""
544
545 $(COMMAND_ECHO)$(SHL$(TNR)LINKER) -v $(SHL$(TNR)LINKFLAGS) \
546 $(LINKFLAGSSHL) $(SHL$(TNR)BASEX) \
547 $(SHL$(TNR)STACK) -o $(SHL$(TNR)TARGETN) \
548 $(SHL$(TNR)DEF) \
549 $(STDOBJ) \
550 -L$(LB) \
551 -L$(SOLARVERSION)/$(INPATH)/lib \
552 $(SHL$(TNR)OBJS) $(SHL$(TNR)VERSIONOBJ) \
553 $(SHL$(TNR)LIBS) \
542
543.ELSE # "$(USE_DEFFILE)"!=""
544
545 $(COMMAND_ECHO)$(SHL$(TNR)LINKER) -v $(SHL$(TNR)LINKFLAGS) \
546 $(LINKFLAGSSHL) $(SHL$(TNR)BASEX) \
547 $(SHL$(TNR)STACK) -o $(SHL$(TNR)TARGETN) \
548 $(SHL$(TNR)DEF) \
549 $(STDOBJ) \
550 -L$(LB) \
551 -L$(SOLARVERSION)/$(INPATH)/lib \
552 $(SHL$(TNR)OBJS) $(SHL$(TNR)VERSIONOBJ) \
553 $(SHL$(TNR)LIBS) \
554 $(SHL$(TNR)STDLIBS:^"-l") \
555 $(SHL$(TNR)LINKRES) \
554 $(SHL$(TNR)LINKRES) \
556 $(SHL$(TNR)STDSHL:^"-l") $(STDSHL$(TNR):^"-l") \
557 @$(LS) $@ >& $(NULLDEV)
555 $(SHL$(TNR)STDLIBS) \
556 $(SHL$(TNR)STDSHL) $(STDSHL$(TNR))
558
559.ENDIF # "$(USE_DEFFILE)"!=""
560
557
558.ENDIF # "$(USE_DEFFILE)"!=""
559
560 $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(SHL$(TNR)IMPLIBN) $@
561 $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(LB)/$(SHL$(TNR)TARGET).lib $@
562
561.IF "$(SHL$(TNR)TARGET8)" != "$(SHL$(TNR)TARGET)"
562 $(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL$(TNR)TARGET8).dll
563.ENDIF
564
565.ENDIF # "$(GUI)" == "OS2"
566
567.ENDIF # "$(SHL$(TNR)TARGETN)"!=""
568

--- 64 unchanged lines hidden --- 		563.IF "$(SHL$(TNR)TARGET8)" != "$(SHL$(TNR)TARGET)"
564 $(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL$(TNR)TARGET8).dll
565.ENDIF
566
567.ENDIF # "$(GUI)" == "OS2"
568
569.ENDIF # "$(SHL$(TNR)TARGETN)"!=""
570

--- 64 unchanged lines hidden ---