~ubuntu-branches/ubuntu/quantal/util-linux/quantal

« back to all changes in this revision

Viewing changes to tests/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Steve Langasek
  • Date: 2011-06-20 22:31:50 UTC
  • mfrom: (1.6.3 upstream) (4.5.1 sid)
  • Revision ID: james.westby@ubuntu.com-20110620223150-lz8wrv0946ihcz3z
Tags: 2.19.1-2ubuntu1
* Merge from Debian unstable, remaining changes:
  - Build for multiarch.
  - Add pre-depends on multiarch-support.
  - configure.ac: don't try to be clever about extracting a path name from
    $libdir to append to /usr in a way that's not overridable; instead,
    reuse the built-in configurable libexecdir.
  - Fix up the .pc.in files to know about libexecdir, so our substitutions
    don't leave us with unusable pkg-config files.
  - Install custom blkid.conf to use /dev/.blkid.tab since we don't
    expect device names to survive a reboot
  - Mention mountall(8) in fstab(5) manpages, along with its special
    options.
  - Since upstart is required in Ubuntu, the hwclock.sh init script is not
    called on startup and the hwclockfirst.sh init script is removed.
  - Drop depends on initscripts for the above.
  - Replace hwclock udev rule with an Upstart job.
  - For the case where mount is called with a directory to mount, look
    that directory up in mountall's /lib/init/fstab if we couldn't find
    it mentioned anywhere else.  This means "mount /proc", "mount /sys",
    etc. work.
  - mount.8 points to the cifs-utils package, not the obsolete smbfs one. 
* Dropped changes:
  - mount.preinst: lsb_release has been fixed in lucid and above to be
    usable without configuration, so we don't have to diverge from Debian
    here anymore.
* Changes merged upstream:
  - sfdisk support for '+' with '-N'
  - mount/umount.c: fix a segfault on umount with empty mtab entry
  - Fix arbitrary unmount with fuse security issue

Show diffs side-by-side

added added

removed removed

Lines of Context:
148
148
LIBBLKID_VERSION_INFO = @LIBBLKID_VERSION_INFO@
149
149
LIBICONV = @LIBICONV@
150
150
LIBINTL = @LIBINTL@
 
151
LIBMOUNT_VERSION = @LIBMOUNT_VERSION@
 
152
LIBMOUNT_VERSION_INFO = @LIBMOUNT_VERSION_INFO@
151
153
LIBOBJS = @LIBOBJS@
152
154
LIBS = @LIBS@
153
155
LIBTOOL = @LIBTOOL@
189
191
SELINUX_LIBS_STATIC = @SELINUX_LIBS_STATIC@
190
192
SET_MAKE = @SET_MAKE@
191
193
SHELL = @SHELL@
 
194
SOCKET_LIBS = @SOCKET_LIBS@
192
195
STRIP = @STRIP@
193
196
SUID_CFLAGS = @SUID_CFLAGS@
194
197
SUID_LDFLAGS = @SUID_LDFLAGS@
279
282
ul_libuuid_srcdir = $(top_srcdir)/shlibs/uuid/src
280
283
ul_libuuid_builddir = $(top_builddir)/shlibs/uuid/src
281
284
ul_libuuid_la = $(top_builddir)/shlibs/uuid/src/libuuid.la
 
285
 
 
286
# mount
 
287
ul_libmount_srcdir = $(top_srcdir)/shlibs/mount/src
 
288
ul_libmount_builddir = $(top_builddir)/shlibs/mount/src
 
289
ul_libmount_la = $(top_builddir)/shlibs/mount/src/libmount.la
 
290
 
 
291
# libmount.h is generated by ./configure script and stored in build directory
 
292
ul_libmount_incdir = $(ul_libmount_builddir)
282
293
SUBDIRS = helpers
283
294
EXTRA_DIST = expected \
284
295
                ts \
641
652
$(ul_libuuid_la):
642
653
        $(MAKE) -C $(ul_libuuid_builddir)
643
654
 
 
655
$(ul_libmount_la):
 
656
        $(MAKE) -C $(ul_libmount_builddir)
 
657
 
644
658
clean-local:
645
659
        rm -rf output diff
646
660