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

« back to all changes in this revision

Viewing changes to lib/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:
38
38
DIST_COMMON = $(dist_noinst_DATA) $(srcdir)/Makefile.am \
39
39
        $(srcdir)/Makefile.in $(top_srcdir)/config/include-Makefile.am
40
40
noinst_PROGRAMS = test_blkdev$(EXEEXT) test_ismounted$(EXEEXT) \
41
 
        test_wholedisk$(EXEEXT)
42
 
@LINUX_TRUE@am__append_1 = linux_version.c
 
41
        test_wholedisk$(EXEEXT) test_mangle$(EXEEXT) test_tt$(EXEEXT) \
 
42
        test_canonicalize$(EXEEXT) test_at$(EXEEXT) \
 
43
        test_strutils$(EXEEXT) $(am__EXEEXT_1)
 
44
@HAVE_CPU_SET_T_TRUE@@LINUX_TRUE@am__append_1 = test_cpuset
 
45
@LINUX_TRUE@am__append_2 = linux_version.c
43
46
subdir = lib
44
47
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
45
48
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
57
60
CONFIG_HEADER = $(top_builddir)/config.h
58
61
CONFIG_CLEAN_FILES =
59
62
CONFIG_CLEAN_VPATH_FILES =
 
63
@HAVE_CPU_SET_T_TRUE@@LINUX_TRUE@am__EXEEXT_1 = test_cpuset$(EXEEXT)
60
64
PROGRAMS = $(noinst_PROGRAMS)
 
65
am_test_at_OBJECTS = at.$(OBJEXT)
 
66
test_at_OBJECTS = $(am_test_at_OBJECTS)
 
67
test_at_LDADD = $(LDADD)
 
68
AM_V_lt = $(am__v_lt_$(V))
 
69
am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 
70
am__v_lt_0 = --silent
61
71
am__test_blkdev_SOURCES_DIST = blkdev.c linux_version.c
62
72
@LINUX_TRUE@am__objects_1 = linux_version.$(OBJEXT)
63
73
am_test_blkdev_OBJECTS = blkdev.$(OBJEXT) $(am__objects_1)
64
74
test_blkdev_OBJECTS = $(am_test_blkdev_OBJECTS)
65
75
test_blkdev_LDADD = $(LDADD)
66
 
AM_V_lt = $(am__v_lt_$(V))
67
 
am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
68
 
am__v_lt_0 = --silent
 
76
am_test_canonicalize_OBJECTS = canonicalize.$(OBJEXT)
 
77
test_canonicalize_OBJECTS = $(am_test_canonicalize_OBJECTS)
 
78
test_canonicalize_LDADD = $(LDADD)
 
79
am__test_cpuset_SOURCES_DIST = cpuset.c
 
80
@LINUX_TRUE@am_test_cpuset_OBJECTS = cpuset.$(OBJEXT)
 
81
test_cpuset_OBJECTS = $(am_test_cpuset_OBJECTS)
 
82
test_cpuset_LDADD = $(LDADD)
69
83
am_test_ismounted_OBJECTS = ismounted.$(OBJEXT)
70
84
test_ismounted_OBJECTS = $(am_test_ismounted_OBJECTS)
71
85
test_ismounted_LDADD = $(LDADD)
 
86
am_test_mangle_OBJECTS = mangle.$(OBJEXT)
 
87
test_mangle_OBJECTS = $(am_test_mangle_OBJECTS)
 
88
test_mangle_LDADD = $(LDADD)
 
89
am_test_strutils_OBJECTS = strutils.$(OBJEXT)
 
90
test_strutils_OBJECTS = $(am_test_strutils_OBJECTS)
 
91
test_strutils_LDADD = $(LDADD)
 
92
am_test_tt_OBJECTS = tt.$(OBJEXT)
 
93
test_tt_OBJECTS = $(am_test_tt_OBJECTS)
 
94
test_tt_LDADD = $(LDADD)
72
95
am_test_wholedisk_OBJECTS = wholedisk.$(OBJEXT)
73
96
test_wholedisk_OBJECTS = $(am_test_wholedisk_OBJECTS)
74
97
test_wholedisk_LDADD = $(LDADD)
98
121
AM_V_GEN = $(am__v_GEN_$(V))
99
122
am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
100
123
am__v_GEN_0 = @echo "  GEN   " $@;
101
 
SOURCES = $(test_blkdev_SOURCES) $(test_ismounted_SOURCES) \
102
 
        $(test_wholedisk_SOURCES)
103
 
DIST_SOURCES = $(am__test_blkdev_SOURCES_DIST) \
104
 
        $(test_ismounted_SOURCES) $(test_wholedisk_SOURCES)
 
124
SOURCES = $(test_at_SOURCES) $(test_blkdev_SOURCES) \
 
125
        $(test_canonicalize_SOURCES) $(test_cpuset_SOURCES) \
 
126
        $(test_ismounted_SOURCES) $(test_mangle_SOURCES) \
 
127
        $(test_strutils_SOURCES) $(test_tt_SOURCES) \
 
128
        $(test_wholedisk_SOURCES)
 
129
DIST_SOURCES = $(test_at_SOURCES) $(am__test_blkdev_SOURCES_DIST) \
 
130
        $(test_canonicalize_SOURCES) $(am__test_cpuset_SOURCES_DIST) \
 
131
        $(test_ismounted_SOURCES) $(test_mangle_SOURCES) \
 
132
        $(test_strutils_SOURCES) $(test_tt_SOURCES) \
 
133
        $(test_wholedisk_SOURCES)
105
134
DATA = $(dist_noinst_DATA)
106
135
ETAGS = etags
107
136
CTAGS = ctags
150
179
LIBBLKID_VERSION_INFO = @LIBBLKID_VERSION_INFO@
151
180
LIBICONV = @LIBICONV@
152
181
LIBINTL = @LIBINTL@
 
182
LIBMOUNT_VERSION = @LIBMOUNT_VERSION@
 
183
LIBMOUNT_VERSION_INFO = @LIBMOUNT_VERSION_INFO@
153
184
LIBOBJS = @LIBOBJS@
154
185
LIBS = @LIBS@
155
186
LIBTOOL = @LIBTOOL@
191
222
SELINUX_LIBS_STATIC = @SELINUX_LIBS_STATIC@
192
223
SET_MAKE = @SET_MAKE@
193
224
SHELL = @SHELL@
 
225
SOCKET_LIBS = @SOCKET_LIBS@
194
226
STRIP = @STRIP@
195
227
SUID_CFLAGS = @SUID_CFLAGS@
196
228
SUID_LDFLAGS = @SUID_LDFLAGS@
281
313
ul_libuuid_srcdir = $(top_srcdir)/shlibs/uuid/src
282
314
ul_libuuid_builddir = $(top_builddir)/shlibs/uuid/src
283
315
ul_libuuid_la = $(top_builddir)/shlibs/uuid/src/libuuid.la
284
 
test_blkdev_SOURCES = blkdev.c $(am__append_1)
 
316
 
 
317
# mount
 
318
ul_libmount_srcdir = $(top_srcdir)/shlibs/mount/src
 
319
ul_libmount_builddir = $(top_builddir)/shlibs/mount/src
 
320
ul_libmount_la = $(top_builddir)/shlibs/mount/src/libmount.la
 
321
 
 
322
# libmount.h is generated by ./configure script and stored in build directory
 
323
ul_libmount_incdir = $(ul_libmount_builddir)
 
324
test_blkdev_SOURCES = blkdev.c $(am__append_2)
285
325
test_ismounted_SOURCES = ismounted.c
286
326
test_wholedisk_SOURCES = wholedisk.c
 
327
test_mangle_SOURCES = mangle.c
 
328
test_at_SOURCES = at.c
 
329
test_strutils_SOURCES = strutils.c
 
330
@LINUX_TRUE@test_cpuset_SOURCES = cpuset.c
 
331
test_tt_SOURCES = tt.c
 
332
test_canonicalize_SOURCES = canonicalize.c
287
333
all: all-am
288
334
 
289
335
.SUFFIXES:
327
373
        list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
328
374
        echo " rm -f" $$list; \
329
375
        rm -f $$list
 
376
test_at$(EXEEXT): $(test_at_OBJECTS) $(test_at_DEPENDENCIES) 
 
377
        @rm -f test_at$(EXEEXT)
 
378
        $(AM_V_CCLD)$(LINK) $(test_at_OBJECTS) $(test_at_LDADD) $(LIBS)
330
379
test_blkdev$(EXEEXT): $(test_blkdev_OBJECTS) $(test_blkdev_DEPENDENCIES) 
331
380
        @rm -f test_blkdev$(EXEEXT)
332
381
        $(AM_V_CCLD)$(LINK) $(test_blkdev_OBJECTS) $(test_blkdev_LDADD) $(LIBS)
 
382
test_canonicalize$(EXEEXT): $(test_canonicalize_OBJECTS) $(test_canonicalize_DEPENDENCIES) 
 
383
        @rm -f test_canonicalize$(EXEEXT)
 
384
        $(AM_V_CCLD)$(LINK) $(test_canonicalize_OBJECTS) $(test_canonicalize_LDADD) $(LIBS)
 
385
test_cpuset$(EXEEXT): $(test_cpuset_OBJECTS) $(test_cpuset_DEPENDENCIES) 
 
386
        @rm -f test_cpuset$(EXEEXT)
 
387
        $(AM_V_CCLD)$(LINK) $(test_cpuset_OBJECTS) $(test_cpuset_LDADD) $(LIBS)
333
388
test_ismounted$(EXEEXT): $(test_ismounted_OBJECTS) $(test_ismounted_DEPENDENCIES) 
334
389
        @rm -f test_ismounted$(EXEEXT)
335
390
        $(AM_V_CCLD)$(LINK) $(test_ismounted_OBJECTS) $(test_ismounted_LDADD) $(LIBS)
 
391
test_mangle$(EXEEXT): $(test_mangle_OBJECTS) $(test_mangle_DEPENDENCIES) 
 
392
        @rm -f test_mangle$(EXEEXT)
 
393
        $(AM_V_CCLD)$(LINK) $(test_mangle_OBJECTS) $(test_mangle_LDADD) $(LIBS)
 
394
test_strutils$(EXEEXT): $(test_strutils_OBJECTS) $(test_strutils_DEPENDENCIES) 
 
395
        @rm -f test_strutils$(EXEEXT)
 
396
        $(AM_V_CCLD)$(LINK) $(test_strutils_OBJECTS) $(test_strutils_LDADD) $(LIBS)
 
397
test_tt$(EXEEXT): $(test_tt_OBJECTS) $(test_tt_DEPENDENCIES) 
 
398
        @rm -f test_tt$(EXEEXT)
 
399
        $(AM_V_CCLD)$(LINK) $(test_tt_OBJECTS) $(test_tt_LDADD) $(LIBS)
336
400
test_wholedisk$(EXEEXT): $(test_wholedisk_OBJECTS) $(test_wholedisk_DEPENDENCIES) 
337
401
        @rm -f test_wholedisk$(EXEEXT)
338
402
        $(AM_V_CCLD)$(LINK) $(test_wholedisk_OBJECTS) $(test_wholedisk_LDADD) $(LIBS)
343
407
distclean-compile:
344
408
        -rm -f *.tab.c
345
409
 
 
410
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/at.Po@am__quote@
346
411
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/blkdev.Po@am__quote@
 
412
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/canonicalize.Po@am__quote@
 
413
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpuset.Po@am__quote@
347
414
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ismounted.Po@am__quote@
348
415
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linux_version.Po@am__quote@
 
416
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mangle.Po@am__quote@
 
417
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strutils.Po@am__quote@
 
418
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tt.Po@am__quote@
349
419
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wholedisk.Po@am__quote@
350
420
 
351
421
.c.o:
582
652
$(ul_libuuid_la):
583
653
        $(MAKE) -C $(ul_libuuid_builddir)
584
654
 
 
655
$(ul_libmount_la):
 
656
        $(MAKE) -C $(ul_libmount_builddir)
 
657
 
585
658
# Tell versions [3.59,3.63) of GNU make to not export all variables.
586
659
# Otherwise a system limit (for SysV at least) may be exceeded.
587
660
.NOEXPORT: