tg_shl.mk (534c536d) tg_shl.mk (4d2a3edf)
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

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

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.cmd $(SHL$(TNR)TARGET))
270.ENDIF
271
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

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

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.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
278
272
279
280$(SHL$(TNR)TARGETN) : \
281 $(SHL$(TNR)OBJS)\
282 $(SHL$(TNR)LIBS)\
283 $(USE_$(TNR)IMPLIB_DEPS)\
284 $(USE_SHL$(TNR)DEF)\
285 $(USE_SHL$(TNR)VERSIONMAP)\
286 $(SHL$(TNR)RES)\
287 $(SHL$(TNR)DEPN) \
273$(SHL$(TNR)TARGETN) : \
274 $(SHL$(TNR)OBJS)\
275 $(SHL$(TNR)LIBS)\
276 $(USE_$(TNR)IMPLIB_DEPS)\
277 $(USE_SHL$(TNR)DEF)\
278 $(USE_SHL$(TNR)VERSIONMAP)\
279 $(SHL$(TNR)RES)\
280 $(SHL$(TNR)DEPN) \
288 $(SHL$(TNR)IMP_ORD) \
289 $(SHL$(TNR)LINKLIST)
290 @echo "Making: " $(@:f)
291.IF "$(GUI)" == "WNT"
292.IF "$(SHL$(TNR)DEFAULTRES)"!=""
293 @@-$(RM) $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
294.IF "$(SHL$(TNR)ICON)" != ""
295 @echo 1 ICON $(SHL$(TNR)ICON) >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
296.ENDIF

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

537 $(SHL$(TNR)OBJS) $(SHL$(TNR)VERSIONOBJ) \
538 $(SHL$(TNR)LIBS) \
539 $(SHL$(TNR)LINKRES) \
540 $(SHL$(TNR)STDLIBS) \
541 $(SHL$(TNR)STDSHL) $(STDSHL$(TNR))
542
543.ELSE # "$(USE_DEFFILE)"!=""
544
281 $(SHL$(TNR)LINKLIST)
282 @echo "Making: " $(@:f)
283.IF "$(GUI)" == "WNT"
284.IF "$(SHL$(TNR)DEFAULTRES)"!=""
285 @@-$(RM) $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
286.IF "$(SHL$(TNR)ICON)" != ""
287 @echo 1 ICON $(SHL$(TNR)ICON) >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
288.ENDIF

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

529 $(SHL$(TNR)OBJS) $(SHL$(TNR)VERSIONOBJ) \
530 $(SHL$(TNR)LIBS) \
531 $(SHL$(TNR)LINKRES) \
532 $(SHL$(TNR)STDLIBS) \
533 $(SHL$(TNR)STDSHL) $(STDSHL$(TNR))
534
535.ELSE # "$(USE_DEFFILE)"!=""
536
545 $(COMMAND_ECHO)$(SHL$(TNR)LINKER) -v $(SHL$(TNR)LINKFLAGS) \
537 $(COMMAND_ECHO)$(SHL$(TNR)LINKER) $(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) \

--- 81 unchanged lines hidden --- 		538 $(LINKFLAGSSHL) $(SHL$(TNR)BASEX) \
539 $(SHL$(TNR)STACK) -o $(SHL$(TNR)TARGETN) \
540 $(SHL$(TNR)DEF) \
541 $(STDOBJ) \
542 -L$(LB) \
543 -L$(SOLARVERSION)/$(INPATH)/lib \
544 $(SHL$(TNR)OBJS) $(SHL$(TNR)VERSIONOBJ) \
545 $(SHL$(TNR)LIBS) \

--- 81 unchanged lines hidden ---