← Back to branch summary

~ubuntu-branches/ubuntu/quantal/open-vm-tools/quantal-201210021442

« back to all changes in this revision

Viewing changes to toolbox/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Serge Hallyn
  • Date: 2011-03-31 14:20:05 UTC
  • mfrom: (1.4.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20110331142005-3n9red91p7ogkweo
Tags: 2011.03.28-387002-0ubuntu1
https://launchpad.net/bugs/727342
https://launchpad.net/bugs/332323
https://launchpad.net/bugs/332323
* Merge latest upstream git tag.  This has the unlocked_ioctl change
  needed to fix dkms build failures (LP: #727342)
* Changes in debian/rules:
  - work around a bug in toolbox/Makefile, where install-exec-hook is
    not happening.  This needs to get fixed the right way.
  - don't install 'vmware-user' which seems to no longer exist
  - move /etc/xdg into open-vm-toolbox (which should be done using .install)
* debian/open-vm-tools.init: add 'modprobe [-r] vmblock'. (LP: #332323)
* debian/rules and debian/open-vm-toolbox.lintian-overrides:
  - Make vmware-user-suid-wrapper suid-root (LP: #332323)

Show diffs side-by-side

added added

removed removed

Lines of Context:
toolbox/Makefile.am
16
16
################################################################################
17
17
 
18
18
COMMON =
19
 
COMMON += ../lib/conf/libConf.la
20
19
COMMON += ../lib/eventManager/libEventManager.la
21
20
COMMON += ../lib/file/libFile.la
22
21
COMMON += ../lib/hgfs/libHgfs.la
37
36
COMMON += ../lib/dict/libDict.la
38
37
COMMON += ../lib/message/libMessage.la
39
38
COMMON += ../lib/unicode/libUnicode.la
40
 
COMMON += ../lib/misc/libMisc.la
41
39
COMMON += ../lib/panicDefault/libPanicDefault.la
42
40
COMMON += ../lib/panic/libPanic.la
 
41
COMMON += ../lib/lock/libLock.la
 
42
COMMON += ../lib/misc/libMisc.la
43
43
COMMON += ../lib/stubs/libStubs.la
44
44
 
45
45
bin_PROGRAMS =
55
55
   vmware_toolbox_LDADD += @GTK_LIBS@
56
56
 
57
57
   vmware_toolbox_SOURCES =
58
 
   vmware_toolbox_SOURCES += debugStdio.c
59
58
   vmware_toolbox_SOURCES += toolbox-gtk.c
60
59
   vmware_toolbox_SOURCES += toolboxAbout.c
61
60
   vmware_toolbox_SOURCES += toolboxDevices.c
63
62
   vmware_toolbox_SOURCES += toolboxOptions.c
64
63
   vmware_toolbox_SOURCES += toolboxScripts.c
65
64
   vmware_toolbox_SOURCES += toolboxShrink.c
 
65
   vmware_toolbox_SOURCES += $(top_srcdir)/libvmtools/fileLogger.c
 
66
   vmware_toolbox_SOURCES += $(top_srcdir)/libvmtools/stdLogger.c
 
67
   vmware_toolbox_SOURCES += $(top_srcdir)/libvmtools/sysLogger.c
66
68
   vmware_toolbox_SOURCES += $(top_srcdir)/libvmtools/vmtoolsConfig.c
 
69
   vmware_toolbox_SOURCES += $(top_srcdir)/libvmtools/vmtoolsLog.c
67
70
 
68
71
   vmware_toolbox_CPPFLAGS =
69
72
   vmware_toolbox_CPPFLAGS += -DG_LOG_DOMAIN=\"toolbox\"
 
73
   vmware_toolbox_CPPFLAGS += -I$(top_srcdir)/libvmtools
70
74
 
71
75
# Here's something wacky: automake will muck up the translation of this
72
76
# conditional if it is indented. For more details, see:
89
93
        $(INSTALL) -d $(DESTDIR)/usr/share/pixmaps/vmware
90
94
        $(INSTALL) -m 644 bigIcon.xpm \
91
95
                $(DESTDIR)/usr/share/pixmaps/vmware/vmware-toolbox.xpm
 
96
        $(INSTALL) -m 755 ../scripts/common/vmware-xdg-detect-de \
 
97
                $(DESTDIR)$(bindir)
92
98
   uninstall-hook:
93
99
        rm -f $(DESTDIR)$(datadir)/share/applications/vmware-toolbox.desktop
94
100
        rm -rf $(DESTDIR)/usr/share/pixmaps/vmware
104
110
vmware_toolbox_cmd_CPPFLAGS += @VMTOOLS_CPPFLAGS@
105
111
 
106
112
vmware_toolbox_cmd_SOURCES =
107
 
vmware_toolbox_cmd_SOURCES += debugStdio.c
108
113
vmware_toolbox_cmd_SOURCES += toolbox-cmd.c
109
114
vmware_toolbox_cmd_SOURCES += toolboxcmd-devices.c
110
115
vmware_toolbox_cmd_SOURCES += toolboxcmd-scripts.c
123
128
endif
124
129
 
125
130
# Message catalogs.
126
 
catalogsdir = $(datadir)/open-vm-tools/messages
127
 
 
128
 
catalogs_DATA =
129
 
catalogs_DATA += messages/toolboxcmd_de.vmsg
130
 
catalogs_DATA += messages/toolboxcmd_ja.vmsg
131
 
catalogs_DATA += messages/toolboxcmd_zh.vmsg
 
131
install-data-hook:
 
132
        @INSTVMSG@ toolboxcmd $(srcdir)/l10n $(DESTDIR)$(datadir)
132
133