~ubuntu-branches/ubuntu/precise/util-linux/precise-proposed

« back to all changes in this revision

Viewing changes to shlibs/blkid/src/Makefile.am

  • 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:
24
24
usrlib_exec_LTLIBRARIES = libblkid.la
25
25
libblkid_la_SOURCES = cache.c dev.c devname.c devno.c getsize.c llseek.c  \
26
26
                     probe.c read.c resolve.c save.c tag.c version.c verify.c \
27
 
                     encode.c list.h blkidP.h superblocks/superblocks.h \
28
 
                     config.c evaluate.c fat.h \
 
27
                     encode.c blkidP.h superblocks/superblocks.h \
 
28
                     config.c evaluate.c \
29
29
                     $(blkidinc_HEADERS) \
30
30
                     $(top_srcdir)/lib/blkdev.c \
31
31
                     $(top_srcdir)/lib/linux_version.c \
32
32
                     $(top_srcdir)/lib/canonicalize.c \
33
33
                     $(top_srcdir)/lib/md5.c \
34
 
                     $(top_srcdir)/lib/crc32.c
 
34
                     $(top_srcdir)/lib/crc32.c \
 
35
                     $(top_srcdir)/include/list.h \
 
36
                     $(top_srcdir)/lib/env.c \
 
37
                     $(top_srcdir)/lib/strutils.c
35
38
 
36
39
nodist_libblkid_la_SOURCES = blkid.h
37
40
 
45
48
libblkid_la_LDFLAGS = -Wl,--version-script=$(ul_libblkid_srcdir)/blkid.sym \
46
49
                      -version-info $(LIBBLKID_VERSION_INFO)
47
50
 
48
 
tests = test_cache test_config test_dev test_devname test_devno test_getsize \
 
51
tests = test_cache test_config test_dev test_devname test_devno \
49
52
        test_read test_resolve test_save test_tag test_verify test_evaluate
50
53
 
51
54
EXTRA_DIST = blkid.sym tst_types.c blkid.h.in
53
56
 
54
57
tests: all $(tests)
55
58
test_%: %.c
56
 
        $(COMPILE) -DTEST_PROGRAM $< .libs/libblkid.a -o $@ $(UUID_LIBS)
 
59
        $(AM_V_CC)$(COMPILE) -DTEST_PROGRAM $< .libs/libblkid.a -o $@ $(UUID_LIBS)
57
60
 
58
61
 
59
62
# move lib from $(usrlib_execdir) to $(libdir) if needed