← Back to branch summary

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

« back to all changes in this revision

Viewing changes to services/vmtoolsd/Makefile.in

  • 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:
services/vmtoolsd/Makefile.in
71
71
am_vmtoolsd_OBJECTS = vmtoolsd-cmdLine.$(OBJEXT) \
72
72
        vmtoolsd-mainLoop.$(OBJEXT) vmtoolsd-mainPosix.$(OBJEXT) \
73
73
        vmtoolsd-pluginMgr.$(OBJEXT) vmtoolsd-serviceObj.$(OBJEXT) \
74
 
        vmtoolsd-toolsRpc.$(OBJEXT) vmtoolsd-svcSignals.$(OBJEXT)
 
74
        vmtoolsd-threadPool.$(OBJEXT) vmtoolsd-toolsRpc.$(OBJEXT) \
 
75
        vmtoolsd-svcSignals.$(OBJEXT)
75
76
vmtoolsd_OBJECTS = $(am_vmtoolsd_OBJECTS)
76
77
am__DEPENDENCIES_1 =
77
78
vmtoolsd_DEPENDENCIES = $(am__DEPENDENCIES_1)
151
152
FGREP = @FGREP@
152
153
FUSE_CPPFLAGS = @FUSE_CPPFLAGS@
153
154
FUSE_LIBS = @FUSE_LIBS@
 
155
GIO_CPPFLAGS = @GIO_CPPFLAGS@
 
156
GIO_LIBS = @GIO_LIBS@
154
157
GLIB2_CPPFLAGS = @GLIB2_CPPFLAGS@
155
158
GLIB2_LIBS = @GLIB2_LIBS@
156
159
GMODULE_CPPFLAGS = @GMODULE_CPPFLAGS@
166
169
GTK_LIBS = @GTK_LIBS@
167
170
HAVE_DOT = @HAVE_DOT@
168
171
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
 
172
HGFS_LIBS = @HGFS_LIBS@
169
173
ICU_CPPFLAGS = @ICU_CPPFLAGS@
170
174
ICU_LIBS = @ICU_LIBS@
171
175
INSTALL = @INSTALL@
173
177
INSTALL_PROGRAM = @INSTALL_PROGRAM@
174
178
INSTALL_SCRIPT = @INSTALL_SCRIPT@
175
179
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 
180
INSTVMSG = @INSTVMSG@
176
181
KERNEL_RELEASE = @KERNEL_RELEASE@
177
182
LD = @LD@
178
183
LDFLAGS = @LDFLAGS@
185
190
LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
186
191
LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
187
192
LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
 
193
LINUXINCLUDE = @LINUXINCLUDE@
188
194
LIPO = @LIPO@
189
195
LN_S = @LN_S@
190
196
LTLIBOBJS = @LTLIBOBJS@
219
225
RANLIB = @RANLIB@
220
226
RPCGEN = @RPCGEN@
221
227
RPCGENFLAGS = @RPCGENFLAGS@
 
228
RPCGEN_WRAPPER = @RPCGEN_WRAPPER@
222
229
SED = @SED@
223
230
SET_MAKE = @SET_MAKE@
224
231
SHELL = @SHELL@
235
242
VMTOOLS_CPPFLAGS = @VMTOOLS_CPPFLAGS@
236
243
VMTOOLS_LIBS = @VMTOOLS_LIBS@
237
244
VMUSR_PLUGIN_INSTALLDIR = @VMUSR_PLUGIN_INSTALLDIR@
238
 
VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
239
 
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
240
245
XDR_LIBS = @XDR_LIBS@
241
246
XMKMF = @XMKMF@
 
247
XSM_LIBS = @XSM_LIBS@
242
248
X_CFLAGS = @X_CFLAGS@
243
249
X_EXTRA_LIBS = @X_EXTRA_LIBS@
244
250
X_LIBS = @X_LIBS@
309
315
vmtoolsd_LDADD = @VMTOOLS_LIBS@ @GMODULE_LIBS@ @GOBJECT_LIBS@ \
310
316
        @GTHREAD_LIBS@ $(am__append_1)
311
317
vmtoolsd_SOURCES = cmdLine.c mainLoop.c mainPosix.c pluginMgr.c \
312
 
        serviceObj.c toolsRpc.c svcSignals.c
 
318
        serviceObj.c threadPool.c toolsRpc.c svcSignals.c
313
319
BUILT_SOURCES = svcSignals.c svcSignals.h
314
320
CLEANFILES = svcSignals.c svcSignals.h
315
321
EXTRA_DIST = svcSignals.gm
452
458
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vmtoolsd-pluginMgr.Po@am__quote@
453
459
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vmtoolsd-serviceObj.Po@am__quote@
454
460
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vmtoolsd-svcSignals.Po@am__quote@
 
461
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vmtoolsd-threadPool.Po@am__quote@
455
462
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vmtoolsd-toolsRpc.Po@am__quote@
456
463
 
457
464
.c.o:
545
552
@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
546
553
@am__fastdepCC_FALSE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(vmtoolsd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o vmtoolsd-serviceObj.obj `if test -f 'serviceObj.c'; then $(CYGPATH_W) 'serviceObj.c'; else $(CYGPATH_W) '$(srcdir)/serviceObj.c'; fi`
547
554
 
 
555
vmtoolsd-threadPool.o: threadPool.c
 
556
@am__fastdepCC_TRUE@    $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(vmtoolsd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT vmtoolsd-threadPool.o -MD -MP -MF $(DEPDIR)/vmtoolsd-threadPool.Tpo -c -o vmtoolsd-threadPool.o `test -f 'threadPool.c' || echo '$(srcdir)/'`threadPool.c
 
557
@am__fastdepCC_TRUE@    $(am__mv) $(DEPDIR)/vmtoolsd-threadPool.Tpo $(DEPDIR)/vmtoolsd-threadPool.Po
 
558
@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='threadPool.c' object='vmtoolsd-threadPool.o' libtool=no @AMDEPBACKSLASH@
 
559
@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 
560
@am__fastdepCC_FALSE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(vmtoolsd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o vmtoolsd-threadPool.o `test -f 'threadPool.c' || echo '$(srcdir)/'`threadPool.c
 
561
 
 
562
vmtoolsd-threadPool.obj: threadPool.c
 
563
@am__fastdepCC_TRUE@    $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(vmtoolsd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT vmtoolsd-threadPool.obj -MD -MP -MF $(DEPDIR)/vmtoolsd-threadPool.Tpo -c -o vmtoolsd-threadPool.obj `if test -f 'threadPool.c'; then $(CYGPATH_W) 'threadPool.c'; else $(CYGPATH_W) '$(srcdir)/threadPool.c'; fi`
 
564
@am__fastdepCC_TRUE@    $(am__mv) $(DEPDIR)/vmtoolsd-threadPool.Tpo $(DEPDIR)/vmtoolsd-threadPool.Po
 
565
@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='threadPool.c' object='vmtoolsd-threadPool.obj' libtool=no @AMDEPBACKSLASH@
 
566
@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 
567
@am__fastdepCC_FALSE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(vmtoolsd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o vmtoolsd-threadPool.obj `if test -f 'threadPool.c'; then $(CYGPATH_W) 'threadPool.c'; else $(CYGPATH_W) '$(srcdir)/threadPool.c'; fi`
 
568
 
548
569
vmtoolsd-toolsRpc.o: toolsRpc.c
549
570
@am__fastdepCC_TRUE@    $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(vmtoolsd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT vmtoolsd-toolsRpc.o -MD -MP -MF $(DEPDIR)/vmtoolsd-toolsRpc.Tpo -c -o vmtoolsd-toolsRpc.o `test -f 'toolsRpc.c' || echo '$(srcdir)/'`toolsRpc.c
550
571
@am__fastdepCC_TRUE@    $(am__mv) $(DEPDIR)/vmtoolsd-toolsRpc.Tpo $(DEPDIR)/vmtoolsd-toolsRpc.Po
720
741
info-am:
721
742
 
722
743
install-data-am: install-pamSCRIPTS
723
 
 
 
744
        @$(NORMAL_INSTALL)
 
745
        $(MAKE) $(AM_MAKEFLAGS) install-data-hook
724
746
install-dvi: install-dvi-am
725
747
 
726
748
install-dvi-am:
769
791
uninstall-am: uninstall-binPROGRAMS uninstall-pamSCRIPTS
770
792
        @$(NORMAL_INSTALL)
771
793
        $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
772
 
.MAKE: all check install install-am install-exec-am install-strip \
773
 
        uninstall-am
 
794
.MAKE: all check install install-am install-data-am install-exec-am \
 
795
        install-strip uninstall-am
774
796
 
775
797
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
776
798
        clean-generic clean-libtool ctags distclean distclean-compile \
777
799
        distclean-generic distclean-libtool distclean-tags distdir dvi \
778
800
        dvi-am html html-am info info-am install install-am \
779
 
        install-binPROGRAMS install-data install-data-am install-dvi \
780
 
        install-dvi-am install-exec install-exec-am install-exec-hook \
781
 
        install-html install-html-am install-info install-info-am \
782
 
        install-man install-pamSCRIPTS install-pdf install-pdf-am \
783
 
        install-ps install-ps-am install-strip installcheck \
784
 
        installcheck-am installdirs maintainer-clean \
785
 
        maintainer-clean-generic mostlyclean mostlyclean-compile \
786
 
        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
787
 
        tags uninstall uninstall-am uninstall-binPROGRAMS \
788
 
        uninstall-hook uninstall-pamSCRIPTS
 
801
        install-binPROGRAMS install-data install-data-am \
 
802
        install-data-hook install-dvi install-dvi-am install-exec \
 
803
        install-exec-am install-exec-hook install-html install-html-am \
 
804
        install-info install-info-am install-man install-pamSCRIPTS \
 
805
        install-pdf install-pdf-am install-ps install-ps-am \
 
806
        install-strip installcheck installcheck-am installdirs \
 
807
        maintainer-clean maintainer-clean-generic mostlyclean \
 
808
        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 
809
        pdf pdf-am ps ps-am tags uninstall uninstall-am \
 
810
        uninstall-binPROGRAMS uninstall-hook uninstall-pamSCRIPTS
789
811
 
790
812
 
791
813
svcSignals.c: $(top_srcdir)/services/vmtoolsd/svcSignals.gm
796
818
        glib-genmarshal --header $(top_srcdir)/services/vmtoolsd/svcSignals.gm > \
797
819
           $@ || (rm -f $@ && exit 1)
798
820
 
 
821
# Message catalogs.
 
822
install-data-hook:
 
823
        @INSTVMSG@ vmtoolsd $(srcdir)/l10n $(DESTDIR)$(datadir)
 
824
 
799
825
install-exec-hook:
800
826
        $(INSTALL) -d $(DESTDIR)/etc/vmware-tools
801
827