~ubuntu-branches/ubuntu/precise/virt-manager/precise-proposed

« back to all changes in this revision

Viewing changes to src/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Marc Deslauriers
  • Date: 2011-02-03 10:35:22 UTC
  • mfrom: (2.3.3 experimental)
  • Revision ID: james.westby@ubuntu.com-20110203103522-j8and6dsy3taczbj
Tags: 0.8.6-1ubuntu1
* Merge from debian experimental. Remaining changes:
  - Depend on python-appindicator for appindicator support.
  - Add a /usr/share/pixmaps/virt-manager-icon.svg symlink to link icon to
    where the Application Indicator can find it.
  - Add patch da_l10n.patch since it is not integrated. (refreshed)
  - Add patch show_session_or_system_in_console to make the overview
    screen show which local qemu session you're connected to. (refreshed)
  - Add patch more_helpful_error_message to explain to the user why he
    can't connect to qemu:///system and what he can do fix it.
  - Add patch qemu-system-by-default to automatically add qemu:///system
    to the list of hypervisors if the user has write access to the UNIX
    socket.
  - Drop patchsys-quilt include since dpkg-source does the quilt dance for
    us.
  - debian/control: lower libvirt-bin from Recommends to Suggests; seems
    some users (like netbooks) want to manage VMs, but not host them; see
    meta packages (ubuntu-virt, ubuntu-virt-server, ubuntu-virt-mgmt) for
    group installation of virt package sets.
* Removed patches:
  - debian/patches/custom-icon-installation.patch: Upstream.
  - debian/patches/remove-appindicator-workarounds.patch: Upstream.
  - debian/patches/fix-nc-with-zsh.patch: Upstream
* Removed python-ipy dependency as it is in universe:
  - debian/control: remove python-ipy from Depends
  - debian/series: disable 0002-Use-IPy-from-python-ipy.patch patch so
    we use the one that's included in the virt-manager source.
  - debian/rules: don't delete the IPy file.
* debian/patches/fix-cpu-wrong-types.patch: fix "value is of wrong type
  for this column" error by making sure we are using strings in
  src/virtManager/details.py.
* debian/patches/dont-always-launch-consoles.patch: Don't always launch
  consoles for running domains in src/virtManager/manager.py.

Show diffs side-by-side

added added

removed removed

Lines of Context:
35
35
POST_UNINSTALL = :
36
36
build_triplet = @build@
37
37
host_triplet = @host@
 
38
@INSTALL_TUI_TRUE@am__append_1 = virtManagerTui
 
39
@INSTALL_TUI_TRUE@am__append_2 = virt-manager-tui.in
 
40
@INSTALL_TUI_TRUE@am__append_3 = virt-manager-tui
 
41
@INSTALL_TUI_TRUE@am__append_4 = $(PACKAGE)-tui.py.in
 
42
@INSTALL_TUI_TRUE@am__append_5 = $(PACKAGE)-tui.py
38
43
subdir = src
39
44
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
40
45
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
88
93
        distdir
89
94
ETAGS = etags
90
95
CTAGS = ctags
91
 
DIST_SUBDIRS = $(SUBDIRS)
 
96
DIST_SUBDIRS = virtManager virtManagerTui
92
97
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
93
98
am__relativize = \
94
99
  dir0=`pwd`; \
125
130
CC = @CC@
126
131
CCDEPMODE = @CCDEPMODE@
127
132
CFLAGS = @CFLAGS@
 
133
CPP = @CPP@
128
134
CPPFLAGS = @CPPFLAGS@
129
135
CYGPATH_W = @CYGPATH_W@
130
136
DATADIRNAME = @DATADIRNAME@
 
137
DEFAULT_QEMU_USER = @DEFAULT_QEMU_USER@
131
138
DEFS = @DEFS@
132
139
DEPDIR = @DEPDIR@
133
140
ECHO_C = @ECHO_C@
134
141
ECHO_N = @ECHO_N@
135
142
ECHO_T = @ECHO_T@
 
143
EGREP = @EGREP@
 
144
ENABLE_UNSUPPORTED_RHEL_OPTS = @ENABLE_UNSUPPORTED_RHEL_OPTS@
136
145
EXEEXT = @EXEEXT@
137
146
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
138
147
GMSGFMT = @GMSGFMT@
139
148
GMSGFMT_015 = @GMSGFMT_015@
 
149
GREP = @GREP@
140
150
INSTALL = @INSTALL@
141
151
INSTALL_DATA = @INSTALL_DATA@
142
152
INSTALL_PROGRAM = @INSTALL_PROGRAM@
148
158
INTLTOOL_PERL = @INTLTOOL_PERL@
149
159
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
150
160
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 
161
KVM_PACKAGES = @KVM_PACKAGES@
151
162
LDFLAGS = @LDFLAGS@
152
163
LIBICONV = @LIBICONV@
153
164
LIBINTL = @LIBINTL@
154
165
LIBOBJS = @LIBOBJS@
155
166
LIBS = @LIBS@
 
167
LIBVIRT_PACKAGES = @LIBVIRT_PACKAGES@
156
168
LTLIBICONV = @LTLIBICONV@
157
169
LTLIBINTL = @LTLIBINTL@
158
170
LTLIBOBJS = @LTLIBOBJS@
 
171
MAINT = @MAINT@
159
172
MAKEINFO = @MAKEINFO@
160
173
MKDIR_P = @MKDIR_P@
161
174
MSGFMT = @MSGFMT@
167
180
PACKAGE_NAME = @PACKAGE_NAME@
168
181
PACKAGE_STRING = @PACKAGE_STRING@
169
182
PACKAGE_TARNAME = @PACKAGE_TARNAME@
 
183
PACKAGE_URL = @PACKAGE_URL@
170
184
PACKAGE_VERSION = @PACKAGE_VERSION@
171
185
PATH_SEPARATOR = @PATH_SEPARATOR@
172
186
POSUB = @POSUB@
173
 
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
 
187
PREFERRED_DISTROS = @PREFERRED_DISTROS@
174
188
SET_MAKE = @SET_MAKE@
175
189
SHELL = @SHELL@
176
190
STRIP = @STRIP@
230
244
top_build_prefix = @top_build_prefix@
231
245
top_builddir = @top_builddir@
232
246
top_srcdir = @top_srcdir@
233
 
SUBDIRS = virtManager
234
 
bin_SCRIPTS_IN = virt-manager.in
235
 
bin_SCRIPTS = virt-manager
 
247
SUBDIRS = virtManager $(am__append_1)
 
248
bin_SCRIPTS_IN = virt-manager.in $(am__append_2)
 
249
bin_SCRIPTS = virt-manager $(am__append_3)
236
250
pythondir = $(pkgdatadir)
237
 
python_DATA_IN = $(PACKAGE).py.in
238
 
python_DATA = $(PACKAGE).py
 
251
python_DATA_IN = $(PACKAGE).py.in $(am__append_4)
 
252
python_DATA = $(PACKAGE).py $(am__append_5)
239
253
libexec_DATA_IN = $(PACKAGE)-launch.in
240
254
libexec_SCRIPTS = $(PACKAGE)-launch
241
255
gladedir = $(pkgdatadir)
249
263
schemadir = $(datadir)/gconf/schemas
250
264
schema_DATA_IN = $(PACKAGE).schemas.in
251
265
schema_DATA = $(PACKAGE).schemas
252
 
CLEANFILES = $(bin_SCRIPTS) $(desktop_DATA) $(dbus_DATA) $(python_DATA)  $(libexec_SCRIPTS) $(schema_DATA) $(PACKAGE).desktop.in
 
266
CLEANFILES = $(bin_SCRIPTS) $(desktop_DATA) $(dbus_DATA) $(python_DATA) $(libexec_SCRIPTS) $(schema_DATA) $(PACKAGE).desktop.in
253
267
EXTRA_DIST = $(bin_SCRIPTS_IN) $(desktop_DATA_IN) $(dbus_DATA_IN) $(python_DATA_IN) $(glade_DATA) $(libexec_DATA_IN) $(schema_DATA_IN)
254
268
all: all-recursive
255
269
 
256
270
.SUFFIXES:
257
 
$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 
271
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
258
272
        @for dep in $?; do \
259
273
          case '$(am__configure_deps)' in \
260
274
            *$$dep*) \
279
293
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
280
294
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
281
295
 
282
 
$(top_srcdir)/configure:  $(am__configure_deps)
 
296
$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
283
297
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
284
 
$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 
298
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
285
299
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
286
300
$(am__aclocal_m4_deps):
287
301
install-binSCRIPTS: $(bin_SCRIPTS)
791
805
          -e "s,::GETTEXTDIR::,$(datadir)/locale," \
792
806
          -e "s,::DATADIR::,$(datadir)," \
793
807
          -e "s,::PYARCHLIBDIR::,$(pkglibdir)," \
794
 
          -e "s,::VIRTINST_VERSION::,$(VIRTINST_VERSION)," < $< > $@
 
808
          -e "s,::VIRTINST_VERSION::,$(VIRTINST_VERSION)," \
 
809
          -e "s,::DEFAULT_QEMU_USER::,$(DEFAULT_QEMU_USER)," \
 
810
          -e "s,::ENABLE_UNSUPPORTED_RHEL_OPTS::,$(ENABLE_UNSUPPORTED_RHEL_OPTS)," \
 
811
          -e "s|::PREFERRED_DISTROS::|$(PREFERRED_DISTROS)|" \
 
812
          -e "s|::HV_PACKAGES::|$(KVM_PACKAGES)|" \
 
813
          -e "s|::LIBVIRT_PACKAGES::|$(LIBVIRT_PACKAGES)|" \
 
814
          < $< > $@
795
815
 
796
816
$(PACKAGE): $(srcdir)/$(PACKAGE).in
797
817
        sed -e "s,::PACKAGE::,$(PACKAGE)," -e "s,::PYTHONDIR::,$(pkgdatadir)," < $< > $@
798
818
 
 
819
$(PACKAGE)-tui: $(srcdir)/$(PACKAGE)-tui.in
 
820
        sed -e "s,::PACKAGE::,$(PACKAGE)-tui," -e "s,::PYTHONDIR::,$(pkgdatadir)," < $< > $@
 
821
 
799
822
$(PACKAGE)-launch: $(srcdir)/$(PACKAGE)-launch.in
800
823
        sed -e "s,::PACKAGE::,$(PACKAGE)," -e "s,::PYTHONDIR::,$(pkgdatadir)," < $< > $@
801
824