~serge-hallyn/ubuntu/oneiric/libvirt/fix-shutdown

« back to all changes in this revision

Viewing changes to tools/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Serge Hallyn
  • Date: 2010-11-02 16:26:51 UTC
  • mfrom: (1.2.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20101102162651-aq8tnbz58mdf01bf
Tags: 0.8.5-0ubuntu1
* New upstream release.
* Removed a slew of patches which have been
  applied upstream since 0.8.3.
  - 9012-apparmor-extra-tests.patch
  - 9013-apparmor-chardev.patch
  - 9015-Add-ubd-to-the-list-of-disk-prefixes.patch
  - 9016-Close-fd-s-of-persistent-tap-devices.patch
  - 9017-Make-sure-all-command-line-arguments-get-passed-to-U.patch
  - 9018-Make-umlConnectTapDevice-ask-brAddTap-for-a-persiste.patch
  - 9019-uml-fix-logic-bug-in-checking-reply-length.patch
  - 9021-Allow-chardev-of-type-file-for-UML-domains.patch
  - 9022-Rename-qemudShrinkDisks-to-virDomainDiskRemove-and-m.patch
  - 9023-Support-virDomainAttachDevice-and-virDomainDetachDev.patch
  - 9024-Explicitly-pass-uml_dir-argument-to-user-mode-linux.patch
  - 9025-Add-nwfilter-support-to-UML-driver.patch
  - 9026-Rebuild-network-filter-for-UML-guests-on-updates.patch
  - 9027-Make-newfilter-xml-transformations-endian-safe.patch
  - 9028-lp628055.patch
* Updated 9002-better_default_uri_virsh.patch to use vshStrdup,
  as now required in that file.  (use of strdup now causes compilation
  to fail)
* Removed 9008-run-as-root-by-default.patch, which has not been
  applied for awhile now, with no ill effects.
* Simple refresh of:
  - 0001-remove-RHism.diff.patch
  - 0003-allow-libvirt-group-to-access-the-socket.patch
  - 0004-fix-Debian-specific-path-to-hvm-loader.patch
  - 0006-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
  - 9000-delayed_iff_up_bridge.patch
  - 9001-dont_clobber_existing_bridges.patch
  - 9003-better-default-arch.patch
  - 9004-libvirtd-group-name.patch
  - 9005-increase-unix-socket-timeout.patch
  - 9006-default-config-test-case.patch
  - 9009-autodetect-nc-params.patch
  - 9010-dont-disable-ipv6.patch
  - 9011-move-ebtables-script.patch
  - 9014-skip-nodeinfotest.patch
  - 9020-lp545795.patch
* Create a patch to include stdint.h so lxc_container.h, which
  #includes linux/fs.h, doesn't trip up on undefined uint64_t.

Show diffs side-by-side

added added

removed removed

Lines of Context:
8
8
        libvirt_win_icon_64x64.ico \
9
9
        virsh_win_icon.rc
10
10
 
11
 
EXTRA_DIST = $(ICON_FILES) virt-xml-validate.in virt-pki-validate.in virsh.pod
 
11
EXTRA_DIST = \
 
12
        $(ICON_FILES)                                   \
 
13
        virt-xml-validate.in                            \
 
14
        virt-pki-validate.in                            \
 
15
        virsh.pod                                       \
 
16
        libvirt-guests.init.in                          \
 
17
        libvirt-guests.sysconf
12
18
 
13
19
bin_SCRIPTS = virt-xml-validate virt-pki-validate
14
20
bin_PROGRAMS = virsh
120
126
virsh.1: virsh.pod
121
127
        $(AM_V_GEN)$(POD2MAN) $< $@
122
128
 
 
129
install-data-local: install-init
 
130
 
 
131
uninstall-local: uninstall-init
 
132
 
 
133
if LIBVIRT_INIT_SCRIPT_RED_HAT
 
134
install-init: libvirt-guests.init
 
135
        mkdir -p $(DESTDIR)$(sysconfdir)/rc.d/init.d
 
136
        $(INSTALL_SCRIPT) libvirt-guests.init \
 
137
          $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirt-guests
 
138
        mkdir -p $(DESTDIR)$(sysconfdir)/sysconfig
 
139
        $(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \
 
140
          $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
 
141
 
 
142
uninstall-init:
 
143
        rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirt-guests \
 
144
          $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
 
145
 
 
146
BUILT_SOURCES += libvirt-guests.init
 
147
 
 
148
libvirt-guests.init: libvirt-guests.init.in $(top_builddir)/config.status
 
149
        $(AM_V_GEN)sed                                  \
 
150
            -e s!\@localstatedir\@!@localstatedir@!g    \
 
151
            -e s!\@sbindir\@!@sbindir@!g                \
 
152
            -e s!\@sysconfdir\@!@sysconfdir@!g          \
 
153
            < $< > $@-t &&                              \
 
154
            chmod a+x $@-t &&                           \
 
155
            mv $@-t $@
 
156
else
 
157
install-init:
 
158
uninstall-init:
 
159
libvirt-guests.init:
 
160
endif # LIBVIRT_INIT_SCRIPT_RED_HAT
 
161
 
123
162
 
124
163
CLEANFILES = $(bin_SCRIPTS) $(man1_MANS)
125
164