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

« back to all changes in this revision

Viewing changes to shlibs/uuid/src/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:
82
82
am__installdirs = "$(DESTDIR)$(usrlib_execdir)" \
83
83
        "$(DESTDIR)$(uuidincdir)"
84
84
LTLIBRARIES = $(usrlib_exec_LTLIBRARIES)
85
 
libuuid_la_LIBADD =
 
85
am__DEPENDENCIES_1 =
86
86
am__objects_1 =
87
87
am_libuuid_la_OBJECTS = clear.lo compare.lo copy.lo gen_uuid.lo \
88
88
        isnull.lo pack.lo parse.lo unpack.lo unparse.lo uuid_time.lo \
97
97
PROGRAMS = $(noinst_PROGRAMS)
98
98
tst_uuid_SOURCES = tst_uuid.c
99
99
tst_uuid_OBJECTS = tst_uuid.$(OBJEXT)
100
 
tst_uuid_DEPENDENCIES = libuuid.la
 
100
tst_uuid_DEPENDENCIES = libuuid.la $(am__DEPENDENCIES_1)
101
101
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
102
102
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
103
103
am__depfiles_maybe = depfiles
175
175
LIBBLKID_VERSION_INFO = @LIBBLKID_VERSION_INFO@
176
176
LIBICONV = @LIBICONV@
177
177
LIBINTL = @LIBINTL@
 
178
LIBMOUNT_VERSION = @LIBMOUNT_VERSION@
 
179
LIBMOUNT_VERSION_INFO = @LIBMOUNT_VERSION_INFO@
178
180
LIBOBJS = @LIBOBJS@
179
181
LIBS = @LIBS@
180
182
LIBTOOL = @LIBTOOL@
216
218
SELINUX_LIBS_STATIC = @SELINUX_LIBS_STATIC@
217
219
SET_MAKE = @SET_MAKE@
218
220
SHELL = @SHELL@
 
221
SOCKET_LIBS = @SOCKET_LIBS@
219
222
STRIP = @STRIP@
220
223
SUID_CFLAGS = @SUID_CFLAGS@
221
224
SUID_LDFLAGS = @SUID_LDFLAGS@
306
309
ul_libuuid_srcdir = $(top_srcdir)/shlibs/uuid/src
307
310
ul_libuuid_builddir = $(top_builddir)/shlibs/uuid/src
308
311
ul_libuuid_la = $(top_builddir)/shlibs/uuid/src/libuuid.la
309
 
tst_uuid_LDADD = libuuid.la #$(ul_libuuid_la)
 
312
 
 
313
# mount
 
314
ul_libmount_srcdir = $(top_srcdir)/shlibs/mount/src
 
315
ul_libmount_builddir = $(top_builddir)/shlibs/mount/src
 
316
ul_libmount_la = $(top_builddir)/shlibs/mount/src/libmount.la
 
317
 
 
318
# libmount.h is generated by ./configure script and stored in build directory
 
319
ul_libmount_incdir = $(ul_libmount_builddir)
 
320
tst_uuid_LDADD = libuuid.la $(SOCKET_LIBS) #$(ul_libuuid_la)
310
321
 
311
322
# includes
312
323
uuidincdir = $(includedir)/uuid
317
328
           uuidd.h uuidP.h uuid_time.c $(uuidinc_HEADERS)
318
329
 
319
330
libuuid_la_DEPENDENCIES = uuid.sym
 
331
libuuid_la_LIBADD = $(SOCKET_LIBS)
320
332
libuuid_la_LDFLAGS = -Wl,--version-script=$(ul_libuuid_srcdir)/uuid.sym \
321
333
                     -version-info $(LIBUUID_VERSION_INFO)
322
334
 
683
695
$(ul_libuuid_la):
684
696
        $(MAKE) -C $(ul_libuuid_builddir)
685
697
 
 
698
$(ul_libmount_la):
 
699
        $(MAKE) -C $(ul_libmount_builddir)
 
700
 
686
701
# move lib from $(usrlib_execdir) to $(libdir) if needed
687
702
install-exec-hook:
688
703
        if test "$(usrlib_execdir)" != "$(libdir)"; then \