← Back to branch summary

~ubuntu-branches/ubuntu/quantal/zeroc-ice/quantal

« back to all changes in this revision

Viewing changes to cpp/src/iceserviceinstall/Makefile.mak

  • Committer: Bazaar Package Importer
  • Author(s): Cleto Martin Angelina
  • Date: 2011-04-25 18:44:24 UTC
  • mfrom: (6.1.14 sid)
  • Revision ID: james.westby@ubuntu.com-20110425184424-sep9i9euu434vq4c
Tags: 3.4.1-7
http://bugs.debian.org/623555
* Bug fix: "libdb5.1-java.jar was renamed to db.jar", thanks to Ondřej
  Surý (Closes: #623555).
* Bug fix: "causes noise in php5", thanks to Jayen Ashar (Closes:
  #623533).

Show diffs side-by-side

added added

removed removed

Lines of Context:
cpp/src/iceserviceinstall/Makefile.mak
1
1
# **********************************************************************
2
2
#
3
 
# Copyright (c) 2003-2009 ZeroC, Inc. All rights reserved.
 
3
# Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
4
4
#
5
5
# This copy of Ice is licensed to you under the terms described in the
6
6
# ICE_LICENSE file included in this distribution.
23
23
CPPFLAGS        = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
24
24
 
25
25
LINKWITH        = $(LIBS)
26
 
!if "$(CPP_COMPILER)" == "VC90" || "$(CPP_COMPILER)" == "VC90_EXPRESS"
27
 
LINKWITH        = /MANIFESTUAC:"level='requireAdministrator' uiAccess='false'" $(LINKWITH)
 
26
!if "$(CPP_COMPILER)" == "VC90" || "$(CPP_COMPILER)" == "VC90_EXPRESS" || \
 
27
    "$(CPP_COMPILER)" == "VC100" || "$(CPP_COMPILER)" == "VC100_EXPRESS"
 
28
LINKWITH        = /MANIFEST /MANIFESTUAC:"level='requireAdministrator' uiAccess='false'" $(LINKWITH)
28
29
!else
29
30
EXTRA_MANIFEST  = security.manifest
30
31
!endif
33
34
PDBFLAGS       = /pdb:$(TOOL:.exe=.pdb)
34
35
!endif
35
36
 
36
 
!if "$(BCPLUSPLUS)" == "yes"
37
 
RES_FILE        = ,, IceServiceInstall.res
38
 
!else
39
37
RES_FILE        = IceServiceInstall.res
40
 
!endif
41
38
 
42
39
$(TOOL): $(OBJS) IceServiceInstall.res
43
40
        $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) $(RES_FILE)
49
46
        del /q IceServiceInstall.res
50
47
 
51
48
install:: all
52
 
        copy $(TOOL) $(install_bindir)
53
 
 
54
 
 
55
 
!if "$(BCPLUSPLUS)" == "yes" && "$(OPTIMIZE)" != "yes"
56
 
 
57
 
install:: all
58
 
        copy $(TOOL:.exe=.tds) $(install_bindir)
59
 
 
60
 
!elseif "$(GENERATE_PDB)" == "yes"
61
 
 
62
 
install:: all
63
 
        copy $(TOOL:.exe=.pdb) $(install_bindir)
 
49
        copy $(TOOL) "$(install_bindir)"
 
50
 
 
51
!if "$(GENERATE_PDB)" == "yes"
 
52
 
 
53
install:: all
 
54
        copy $(TOOL:.exe=.pdb) "$(install_bindir)"
64
55
 
65
56
!endif
66
57
 
67
58
 
68
 
!include .depend
 
59
!include .depend.mak
69
60